matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: clean up tab-completion memory counting

Browse source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-01-26 21:57:24 +01:00
parent 55b7f20fda
commit 66d29a54a1
5 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/vector.c
View file

@ -25,7 +25,7 @@
#include "memory.h" #include "memory.h"
DEFINE_MTYPE_STATIC(LIB, VECTOR, "Vector") DEFINE_MTYPE_STATIC(LIB, VECTOR, "Vector")
DEFINE_MTYPE( LIB, VECTOR_INDEX, "Vector index") DEFINE_MTYPE_STATIC(LIB, VECTOR_INDEX, "Vector index")
/* Initialize vector : allocate memory and return vector. */ /* Initialize vector : allocate memory and return vector. */
vector vector
@ -43,18 +43,6 @@ vector_init (unsigned int size)
return v; return v;
} }
void
vector_only_wrapper_free (vector v)
{
XFREE (MTYPE_VECTOR, v);
}
void
vector_only_index_free (void *index)
{
XFREE (MTYPE_VECTOR_INDEX, index);
}
void void
vector_free (vector v) vector_free (vector v)
{ {

3
lib/vector.h
View file

@ -24,7 +24,6 @@
#define _ZEBRA_VECTOR_H #define _ZEBRA_VECTOR_H
#include "memory.h" #include "memory.h"
DECLARE_MTYPE(VECTOR_INDEX)
/* struct for vector */ /* struct for vector */
struct _vector struct _vector
@ -55,8 +54,6 @@ extern int vector_set (vector v, void *val);
extern int vector_set_index (vector v, unsigned int i, void *val); extern int vector_set_index (vector v, unsigned int i, void *val);
extern void vector_unset (vector v, unsigned int i); extern void vector_unset (vector v, unsigned int i);
extern unsigned int vector_count (vector v); extern unsigned int vector_count (vector v);
extern void vector_only_wrapper_free (vector v);
extern void vector_only_index_free (void *index);
extern void vector_free (vector v); extern void vector_free (vector v);
extern vector vector_copy (vector v); extern vector vector_copy (vector v);

4
lib/vty.c
View file

@ -962,8 +962,6 @@ vty_complete_command (struct vty *vty)
vty_backward_pure_word (vty); vty_backward_pure_word (vty);
vty_insert_word_overwrite (vty, matched[0]); vty_insert_word_overwrite (vty, matched[0]);
XFREE (MTYPE_TMP, matched[0]); XFREE (MTYPE_TMP, matched[0]);
vector_only_index_free (matched);
return;
break; break;
case CMD_COMPLETE_LIST_MATCH: case CMD_COMPLETE_LIST_MATCH:
for (i = 0; matched[i] != NULL; i++) for (i = 0; matched[i] != NULL; i++)
@ -986,7 +984,7 @@ vty_complete_command (struct vty *vty)
break; break;
} }
if (matched) if (matched)
vector_only_index_free (matched); XFREE (MTYPE_TMP, matched);
} }
static void static void

2
tests/test-commands.c
View file

@ -317,7 +317,7 @@ test_run(struct prng *prng, struct vty *vty, const char *cmd, unsigned int edit_
printf(" '%s'\n", completions[j]); printf(" '%s'\n", completions[j]);
XFREE(MTYPE_TMP, completions[j]); XFREE(MTYPE_TMP, completions[j]);
} }
XFREE(MTYPE_VECTOR_INDEX, completions); XFREE(MTYPE_TMP, completions);
} }
vty->node = cnode->node; vty->node = cnode->node;

5
vtysh/vtysh.c
View file

@ -828,8 +828,6 @@ command_generator (const char *text, int state)
if (rl_end && isspace ((int) rl_line_buffer[rl_end - 1])) if (rl_end && isspace ((int) rl_line_buffer[rl_end - 1]))
vector_set (vline, NULL); vector_set (vline, NULL);
if (matched)
XFREE (MTYPE_TMP, matched);
matched = cmd_complete_command (vline, vty, &complete_status); matched = cmd_complete_command (vline, vty, &complete_status);
cmd_free_strvec (vline); cmd_free_strvec (vline);
} }
@ -837,6 +835,9 @@ command_generator (const char *text, int state)
if (matched && matched[index]) if (matched && matched[index])
return matched[index++]; return matched[index++];
XFREE (MTYPE_TMP, matched);
matched = NULL;
return NULL; return NULL;
} }