Fixed bug in FIB_ITERATE_END: it assumed the control variable is named

"z". I've added an argument specifying name of the variable.

Renamed "again" label in FIB_ITERATE_* to "fis_again" to avoid name
clashes.

diff --git a/nest/route.h b/nest/route.h
index da0f1cd2e98a2a0fce0265926f7e88b798a1df4e..916a704ba3286345b9dd9773ea1db800483bc1aa 100644 (file)
--- a/nest/route.h
+++ b/nest/route.h
@@ -82,14 +82,14 @@ void fit_put(struct fib_iterator *, struct fib_node *);
        unsigned int count = (fib)->hash_size;                  \
        unsigned int hpos = (it)->hash;                         \
        for(;;) {                                               \
-       again:  if (!z) {                                       \
+       fis_again:      if (!z) {                               \
                        if (++hpos >= count)                    \
                                break;                          \
                        z = (fib)->hash_table[hpos];            \
-                       goto again;                             \
+                       goto fis_again;                         \
                }
 
-#define FIB_ITERATE_END z = z->next; } } while(0)
+#define FIB_ITERATE_END(z) z = z->next; } } while(0)
 
 #define FIB_ITERATE_PUT(it, z) fit_put(it, z)
 
@@ -160,6 +160,7 @@ void rte_free(rte *);
 void rt_dump(rtable *);
 void rt_dump_all(void);
 void rt_feed_baby(struct proto *p);
+void rt_prune(rtable *tab);
 
 /*
  *     Route Attributes