proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-02-01 17:19:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: argv fixes, XFREE -> free, rm decl in matcher

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2016-09-22 20:26:07 +00:00
parent aa1c90a487
commit 97e5b7c0b3
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/command.c
View File

@ -2005,13 +2005,13 @@ DEFUN (banner_motd_file,
"Banner from a file\n"
"Filename\n")
{
int cmd = cmd_banner_motd_file (argv[3]->arg);
const char *filename = argv[3]->arg;
int cmd = cmd_banner_motd_file (filename);
if (cmd == CMD_ERR_NO_FILE)
vty_out (vty, "%s does not exist", argv[3]->arg);
vty_out (vty, "%s does not exist", filename);
else if (cmd == CMD_WARNING)
vty_out (vty, "%s must be in %s",
argv[0], SYSCONFDIR);
vty_out (vty, "%s must be in %s", filename, SYSCONFDIR);
return cmd;
}
@ -2230,20 +2230,19 @@ del_cmd_token (struct cmd_token *token)
if (!token) return;
if (token->text)
XFREE (MTYPE_CMD_TOKENS, token->text);
free (token->text);
if (token->desc)
XFREE (MTYPE_CMD_TOKENS, token->desc);
free (token->desc);
if (token->arg)
XFREE (MTYPE_CMD_TOKENS, token->arg);
free (token->arg);
XFREE (MTYPE_CMD_TOKENS, token);
free (token);
}
struct cmd_token *
copy_cmd_token (struct cmd_token *token)
{
struct cmd_token *copy = new_cmd_token (token->type, NULL, NULL);
copy->value = token->value;
copy->max = token->max;
copy->min = token->min;
copy->text = token->text ? XSTRDUP (MTYPE_CMD_TOKENS, token->text) : NULL;
@ -2257,9 +2256,9 @@ void
del_cmd_element(struct cmd_element *cmd)
{
if (!cmd) return;
XFREE (MTYPE_CMD_TOKENS, cmd->string);
XFREE (MTYPE_CMD_TOKENS, cmd->doc);
XFREE (MTYPE_CMD_TOKENS, cmd);
free ((char *) cmd->string);
free ((char *) cmd->doc);
free (cmd);
}
struct cmd_element *

3
lib/command_match.c
View File

@ -77,9 +77,6 @@ match_range (struct cmd_token *, const char *);
static enum match_type
match_word (struct cmd_token *, const char *);
static enum match_type
match_number (struct cmd_token *, const char *);
static enum match_type
match_variable (struct cmd_token *, const char *);