Merge pull request #2728 from donaldsharp/table_cleanup

lib: Add parameter names as a hint of what is expected.

diff --combined lib/table.h
index f58a6025e2105083ad2afb2ad35f2be817d7d7bb,8304abe59b38ec5b3b349b1848a412ccf266a9a3..ac7df3e6950b455a93c95354620e2e204baf2293
--- 1/lib/table.h
--- 2/lib/table.h
+++ b/lib/table.h
@@@ -178,35 -178,37 +178,37 @@@ struct route_table_iter_t_ 
  extern struct route_table *route_table_init(void);
  
  extern struct route_table *
- route_table_init_with_delegate(route_table_delegate_t *);
+ route_table_init_with_delegate(route_table_delegate_t *delegate);
  
  extern route_table_delegate_t *route_table_get_default_delegate(void);
  
- extern void route_table_finish(struct route_table *);
- extern struct route_node *route_top(struct route_table *);
- extern struct route_node *route_next(struct route_node *);
- extern struct route_node *route_next_until(struct route_node *,
-                                          const struct route_node *);
- extern struct route_node *route_node_get(struct route_table *const,
-                                        union prefixconstptr);
- extern struct route_node *route_node_lookup(const struct route_table *,
-                                           union prefixconstptr);
- extern struct route_node *route_node_lookup_maynull(const struct route_table *,
-                                                   union prefixconstptr);
- extern struct route_node *route_node_match(const struct route_table *,
-                                          union prefixconstptr);
- extern struct route_node *route_node_match_ipv4(const struct route_table *,
-                                               const struct in_addr *);
- extern struct route_node *route_node_match_ipv6(const struct route_table *,
-                                               const struct in6_addr *);
- 
- extern unsigned long route_table_count(const struct route_table *);
- 
- extern struct route_node *route_node_create(route_table_delegate_t *,
-                                           struct route_table *);
- extern void route_node_delete(struct route_node *);
- extern void route_node_destroy(route_table_delegate_t *, struct route_table *,
-                              struct route_node *);
+ 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,
+                                        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);
+ 
+ extern struct route_node *route_node_create(route_table_delegate_t *delegate,
+                                           struct route_table *table);
+ extern void route_node_delete(struct route_node *node);
+ 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);
@@@ -233,17 -235,13 +235,17 @@@ static inline struct route_node *route_
  }
  
  /* Unlock node. */
 -static inline void route_unlock_node(struct route_node *node)
 +static inline struct route_node *route_unlock_node(struct route_node *node)
  {
        assert(node->lock > 0);
        (*(unsigned *)&node->lock)--;
  
 -      if (node->lock == 0)
 +      if (node->lock == 0) {
                route_node_delete(node);
 +              return NULL;
 +      }
 +
 +      return node;
  }
  
  /*