2005-04-25 Paul Jakma <paul.jakma@sun.com>

	* memory.c: Make the string field much wider
	* memtypes.c: Correct the prefix list str/entry strings

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 3b619d8bd852bcc03dbaaf23b5e34ac59e990260..61b376427ac32a0ee1e51758a90cef8610c6ac2b 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -2,6 +2,8 @@
 
        * Makefile.am: Refer to source files via srcdir variable, fix
          out-of-tree build breakage.
+       * memory.c: Make the string field much wider
+       * memtypes.c: Correct the prefix list str/entry strings
 
 2005-04-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 

diff --git a/lib/memory.c b/lib/memory.c
index 335a92112627a3444fa3422b91f51cfa5152133e..adf23b19b3639999974f0ff74218d094f4c11b97 100644 (file)
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -264,7 +264,7 @@ show_memory_vty (struct vty *vty, struct memory_list *list)
     if (m->index == 0)
       vty_out (vty, "-----------------------------\r\n");
     else
-      vty_out (vty, "%-22s: %10ld\r\n", m->format, mstat[m->index].alloc);
+      vty_out (vty, "%-30s: %10ld\r\n", m->format, mstat[m->index].alloc);
 }
 
 DEFUN (show_memory_all,

diff --git a/lib/memtypes.c b/lib/memtypes.c
index 6ee75a5823921dc55be5953157d682dc394dc73f..7caa42a1307a9fd9e4d1887fba7c05487d969a04 100644 (file)
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -6,7 +6,7 @@
  * The script is sensitive to the format (though not whitespace), see
  * the top of memtypes.awk for more details.
  *
- * $Id: memtypes.c,v 1.2 2005/04/16 15:51:05 paul Exp $
+ * $Id: memtypes.c,v 1.3 2005/04/25 14:02:44 paul Exp $
  */
 
 #include "zebra.h"
@@ -48,8 +48,8 @@ struct memory_list memory_list_lib[] =
   { MTYPE_ACCESS_LIST_STR,     "Access List Str"               },
   { MTYPE_ACCESS_FILTER,       "Access Filter"                 },
   { MTYPE_PREFIX_LIST,         "Prefix List"                   },
-  { MTYPE_PREFIX_LIST_ENTRY,   "Prefix List Str"               },
-  { MTYPE_PREFIX_LIST_STR,     "Prefix List Entry"             },
+  { MTYPE_PREFIX_LIST_ENTRY,   "Prefix List Entry"             },
+  { MTYPE_PREFIX_LIST_STR,     "Prefix List Str"               },
   { MTYPE_ROUTE_MAP,           "Route map"                     },
   { MTYPE_ROUTE_MAP_NAME,      "Route map name"                },
   { MTYPE_ROUTE_MAP_INDEX,     "Route map index"               },