2005-03-14 Paul Jakma <paul.jakma@sun.com>
* (global) update all c files to match the lib/vector.h rename of
(struct vector).active to max, and vector_max macro to
vector_active.
* lib/vector.h: Rename to (struct vector).max to slightly less
confusing active, for the number of active slots, distinct from
allocated or active-and-not-empty. Rename vector_max to
vector_active for same reason.
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index bef7699..5d317ee 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -644,7 +644,7 @@
unsigned int i;
char *str;
- for (i = 0; i < vector_max (ripng_enable_if); i++)
+ for (i = 0; i < vector_active (ripng_enable_if); i++)
if ((str = vector_slot (ripng_enable_if, i)) != NULL)
if (strcmp (str, ifname) == 0)
return i;
@@ -851,7 +851,7 @@
}
/* ripng_enable_if */
- for (i = 0; i < vector_max (ripng_enable_if); i++)
+ for (i = 0; i < vector_active (ripng_enable_if); i++)
if ((str = vector_slot (ripng_enable_if, i)) != NULL) {
free (str);
vector_slot (ripng_enable_if, i) = NULL;
@@ -868,7 +868,7 @@
unsigned int i;
char *str;
- for (i = 0; i < vector_max (Vripng_passive_interface); i++)
+ for (i = 0; i < vector_active (Vripng_passive_interface); i++)
if ((str = vector_slot (Vripng_passive_interface, i)) != NULL)
if (strcmp (str, ifname) == 0)
return i;
@@ -943,7 +943,7 @@
unsigned int i;
char *str;
- for (i = 0; i < vector_max (Vripng_passive_interface); i++)
+ for (i = 0; i < vector_active (Vripng_passive_interface); i++)
if ((str = vector_slot (Vripng_passive_interface, i)) != NULL)
{
free (str);
@@ -975,7 +975,7 @@
}
/* Write enable interface. */
- for (i = 0; i < vector_max (ripng_enable_if); i++)
+ for (i = 0; i < vector_active (ripng_enable_if); i++)
if ((ifname = vector_slot (ripng_enable_if, i)) != NULL)
vty_out (vty, "%s%s%s",
config_mode ? " network " : " ",
@@ -984,7 +984,7 @@
/* Write passive interface. */
if (config_mode)
- for (i = 0; i < vector_max (Vripng_passive_interface); i++)
+ for (i = 0; i < vector_active (Vripng_passive_interface); i++)
if ((ifname = vector_slot (Vripng_passive_interface, i)) != NULL)
vty_out (vty, " passive-interface %s%s", ifname, VTY_NEWLINE);