diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ChangeLog | 11 | ||||
| -rw-r--r-- | lib/buffer.c | 2 | ||||
| -rw-r--r-- | lib/buffer.h | 7 | ||||
| -rw-r--r-- | lib/filter.c | 32 | ||||
| -rw-r--r-- | lib/if.c | 16 | ||||
| -rw-r--r-- | lib/plist.c | 32 |
6 files changed, 21 insertions, 79 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 7955f098..34dad166 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,14 @@ +2005-01-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + + * buffer.h: Fix comment on buffer_getstr to reflect that it now + uses XMALLOC. + * buffer.c: (buffer_getstr) Use XMALLOC(MTYPE_TMP) instead of malloc. + * filter.c: (access_list_remark,ipv6_access_list_remark) Use + argv_concat instead of buffer_getstr. + * if.c: (interface_desc) Use argv_concat instead of buffer_getstr. + * plist.c: (ip_prefix_list_description,ipv6_prefix_list_description) + Use argv_concat instead of buffer_getstr. + 2005-01-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * lib/buffer.h: Document behavior of buffer_getstr function. diff --git a/lib/buffer.c b/lib/buffer.c index 60048bc0..8666ab78 100644 --- a/lib/buffer.c +++ b/lib/buffer.c @@ -95,7 +95,7 @@ buffer_getstr (struct buffer *b) for (data = b->head; data; data = data->next) totlen += data->cp - data->sp; - if (!(s = malloc(totlen+1))) + if (!(s = XMALLOC(MTYPE_TMP, totlen+1))) return NULL; p = s; for (data = b->head; data; data = data->next) diff --git a/lib/buffer.h b/lib/buffer.h index c3787d78..c0245a7f 100644 --- a/lib/buffer.h +++ b/lib/buffer.h @@ -67,10 +67,9 @@ int buffer_write (struct buffer *, const void *, size_t); void buffer_free (struct buffer *); /* Combine all accumulated (and unflushed) data inside the buffer into a - single NUL-terminated string allocated using malloc (N.B. should be changed - to use XMALLOC(MTYPE_TMP)). Note that this function does not alter - the state of the buffer, so the data is still inside waiting to be - flushed. */ + single NUL-terminated string allocated using XMALLOC(MTYPE_TMP). Note + that this function does not alter the state of the buffer, so the data + is still inside waiting to be flushed. */ char *buffer_getstr (struct buffer *); int buffer_putc (struct buffer *, u_char); diff --git a/lib/filter.c b/lib/filter.c index 9817c07d..0dd7a775 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -1359,8 +1359,6 @@ DEFUN (access_list_remark, "Comment up to 100 characters\n") { struct access_list *access; - struct buffer *b; - int i; access = access_list_get (AFI_IP, argv[0]); @@ -1369,19 +1367,7 @@ DEFUN (access_list_remark, XFREE (MTYPE_TMP, access->remark); access->remark = NULL; } - - /* Below is remark get codes. */ - b = buffer_new (1024); - for (i = 1; i < argc; i++) - { - buffer_putstr (b, argv[i]); - buffer_putc (b, ' '); - } - buffer_putc (b, '\0'); - - access->remark = buffer_getstr (b); - - buffer_free (b); + access->remark = argv_concat(argv, argc, 1); return CMD_SUCCESS; } @@ -1541,8 +1527,6 @@ DEFUN (ipv6_access_list_remark, "Comment up to 100 characters\n") { struct access_list *access; - struct buffer *b; - int i; access = access_list_get (AFI_IP6, argv[0]); @@ -1551,19 +1535,7 @@ DEFUN (ipv6_access_list_remark, XFREE (MTYPE_TMP, access->remark); access->remark = NULL; } - - /* Below is remark get codes. */ - b = buffer_new (1024); - for (i = 1; i < argc; i++) - { - buffer_putstr (b, argv[i]); - buffer_putc (b, ' '); - } - buffer_putc (b, '\0'); - - access->remark = buffer_getstr (b); - - buffer_free (b); + access->remark = argv_concat(argv, argc, 1); return CMD_SUCCESS; } @@ -453,27 +453,15 @@ DEFUN (interface_desc, "Interface specific description\n" "Characters describing this interface\n") { - int i; struct interface *ifp; - struct buffer *b; if (argc == 0) return CMD_SUCCESS; ifp = vty->index; if (ifp->desc) - XFREE (0, ifp->desc); - - b = buffer_new (1024); - for (i = 0; i < argc; i++) - { - buffer_putstr (b, argv[i]); - buffer_putc (b, ' '); - } - buffer_putc (b, '\0'); - - ifp->desc = buffer_getstr (b); - buffer_free (b); + XFREE (MTYPE_TMP, ifp->desc); + ifp->desc = argv_concat(argv, argc, 0); return CMD_SUCCESS; } diff --git a/lib/plist.c b/lib/plist.c index 3520f82f..5e2edd29 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -1561,8 +1561,6 @@ DEFUN (ip_prefix_list_description, "Up to 80 characters describing this prefix-list\n") { struct prefix_list *plist; - struct buffer *b; - int i; plist = prefix_list_get (AFI_IP, argv[0]); @@ -1571,19 +1569,7 @@ DEFUN (ip_prefix_list_description, XFREE (MTYPE_TMP, plist->desc); plist->desc = NULL; } - - /* Below is description get codes. */ - b = buffer_new (1024); - for (i = 1; i < argc; i++) - { - buffer_putstr (b, argv[i]); - buffer_putc (b, ' '); - } - buffer_putc (b, '\0'); - - plist->desc = buffer_getstr (b); - - buffer_free (b); + plist->desc = argv_concat(argv, argc, 1); return CMD_SUCCESS; } @@ -2171,8 +2157,6 @@ DEFUN (ipv6_prefix_list_description, "Up to 80 characters describing this prefix-list\n") { struct prefix_list *plist; - struct buffer *b; - int i; plist = prefix_list_get (AFI_IP6, argv[0]); @@ -2181,19 +2165,7 @@ DEFUN (ipv6_prefix_list_description, XFREE (MTYPE_TMP, plist->desc); plist->desc = NULL; } - - /* Below is description get codes. */ - b = buffer_new (1024); - for (i = 1; i < argc; i++) - { - buffer_putstr (b, argv[i]); - buffer_putc (b, ' '); - } - buffer_putc (b, '\0'); - - plist->desc = buffer_getstr (b); - - buffer_free (b); + plist->desc = argv_concat(argv, argc, 1); return CMD_SUCCESS; } |