Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / lib / table.h

diff --git a/lib/table.h b/lib/table.h
index 3e3fb658aebe011df1ded9fde4bab856489b1b7c..7743d51681ade02a3d57bafe4339585e2d5d3179 100644 (file)
--- a/lib/table.h
+++ b/lib/table.h
@@ -31,7 +31,6 @@
 extern "C" {
 #endif
 
-DECLARE_MTYPE(ROUTE_TABLE)
 DECLARE_MTYPE(ROUTE_NODE)
 
 /*
@@ -46,7 +45,7 @@ struct route_table;
  * Function vector that can be used by a client to customize the
  * behavior of one or more route tables.
  */
-typedef struct route_table_delegate_t_ route_table_delegate_t;
+typedef const struct route_table_delegate_t_ route_table_delegate_t;
 
 typedef struct route_node *(*route_table_create_node_func_t)(
        route_table_delegate_t *, struct route_table *);
@@ -198,26 +197,29 @@ static inline void route_table_set_info(struct route_table *table, void *d)
        table->info = d;
 }
 
+/* ext_pure => extern __attribute__((pure))
+ *   does not modify memory (but depends on mem), allows compiler to optimize
+ */
+
 extern void route_table_finish(struct route_table *table);
-extern struct route_node *route_top(struct route_table *table);
-extern struct route_node *route_next(struct route_node *node);
-extern struct route_node *route_next_until(struct route_node *node,
-                                          const struct route_node *limit);
-extern struct route_node *route_node_get(struct route_table *const table,
+ext_pure struct route_node *route_top(struct route_table *table);
+ext_pure struct route_node *route_next(struct route_node *node);
+ext_pure struct route_node *route_next_until(struct route_node *node,
+                                            const struct route_node *limit);
+extern struct route_node *route_node_get(struct route_table *table,
                                         union prefixconstptr pu);
-extern struct route_node *route_node_lookup(const struct route_table *table,
-                                           union prefixconstptr pu);
-extern struct route_node *
-route_node_lookup_maynull(const struct route_table *table,
-                         union prefixconstptr pu);
-extern struct route_node *route_node_match(const struct route_table *table,
-                                          union prefixconstptr pu);
-extern struct route_node *route_node_match_ipv4(const struct route_table *table,
-                                               const struct in_addr *addr);
-extern struct route_node *route_node_match_ipv6(const struct route_table *table,
-                                               const struct in6_addr *addr);
-
-extern unsigned long route_table_count(const struct route_table *table);
+ext_pure struct route_node *route_node_lookup(struct route_table *table,
+                                             union prefixconstptr pu);
+ext_pure struct route_node *route_node_lookup_maynull(struct route_table *table,
+                                                     union prefixconstptr pu);
+ext_pure struct route_node *route_node_match(struct route_table *table,
+                                            union prefixconstptr pu);
+ext_pure struct route_node *route_node_match_ipv4(struct route_table *table,
+                                                 const struct in_addr *addr);
+ext_pure struct route_node *route_node_match_ipv6(struct route_table *table,
+                                                 const struct in6_addr *addr);
+
+ext_pure unsigned long route_table_count(struct route_table *table);
 
 extern struct route_node *route_node_create(route_table_delegate_t *delegate,
                                            struct route_table *table);
@@ -226,10 +228,10 @@ extern void route_node_destroy(route_table_delegate_t *delegate,
                               struct route_table *table,
                               struct route_node *node);
 
-extern struct route_node *route_table_get_next(const struct route_table *table,
-                                              union prefixconstptr pu);
-extern int route_table_prefix_iter_cmp(const struct prefix *p1,
-                                      const struct prefix *p2);
+ext_pure struct route_node *route_table_get_next(struct route_table *table,
+                                                union prefixconstptr pu);
+ext_pure int route_table_prefix_iter_cmp(const struct prefix *p1,
+                                        const struct prefix *p2);
 
 /*
  * Iterator functions.
@@ -295,6 +297,8 @@ static inline struct route_node *route_table_iter_next(route_table_iter_t *iter)
                return NULL;
 
        default:
+               /* Suppress uninitialized variable warning */
+               node = NULL;
                assert(0);
        }
 
@@ -310,7 +314,7 @@ static inline struct route_node *route_table_iter_next(route_table_iter_t *iter)
 /*
  * route_table_iter_is_done
  *
- * Returns TRUE if the iteration is complete.
+ * Returns true if the iteration is complete.
  */
 static inline int route_table_iter_is_done(route_table_iter_t *iter)
 {
@@ -320,7 +324,7 @@ static inline int route_table_iter_is_done(route_table_iter_t *iter)
 /*
  * route_table_iter_started
  *
- * Returns TRUE if this iterator has started iterating over the tree.
+ * Returns true if this iterator has started iterating over the tree.
  */
 static inline int route_table_iter_started(route_table_iter_t *iter)
 {