proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 06:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: make match functions take const args

Browse Source 
* table.c: general type safety and compiler help:
  * maskbit[]: become const
  * route_node_match(): take const args
  * route_node_match_ipv4(): idem
  * route_node_match_ipv6(): idem
  * check_bit(): idem, plus adjust local vars typing
This commit is contained in:
Stephen Hemminger 2009-12-08 12:00:50 +03:00 committed by Denis Ovsienko
parent 0d6388abc7
commit 38cc00cd82
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/table.c
View File

@ -125,7 +125,7 @@ route_table_free (struct route_table *rt)
} }
/* Utility mask array. */ /* Utility mask array. */
static u_char maskbit[] = static const u_char maskbit[] =
{ {
0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff
}; };
@ -170,11 +170,11 @@ route_common (struct prefix *n, struct prefix *p, struct prefix *new)
/* Check bit of the prefix. */ /* Check bit of the prefix. */
static int static int
check_bit (u_char *prefix, u_char prefixlen) check_bit (const u_char *prefix, u_char prefixlen)
{ {
int offset; unsigned int offset;
int shift; unsigned int shift;
u_char *p = (u_char *)prefix; const u_char *p = prefix;
assert (prefixlen <= 128); assert (prefixlen <= 128);
@ -221,7 +221,7 @@ route_unlock_node (struct route_node *node)
/* Find matched prefix. */ /* Find matched prefix. */
struct route_node * struct route_node *
route_node_match (struct route_table *table, struct prefix *p) route_node_match (const struct route_table *table, const struct prefix *p)
{ {
struct route_node *node; struct route_node *node;
struct route_node *matched; struct route_node *matched;
@ -247,7 +247,8 @@ route_node_match (struct route_table *table, struct prefix *p)
} }
struct route_node * struct route_node *
route_node_match_ipv4 (struct route_table *table, struct in_addr *addr) route_node_match_ipv4 (const struct route_table *table,
const struct in_addr *addr)
{ {
struct prefix_ipv4 p; struct prefix_ipv4 p;
@ -261,7 +262,8 @@ route_node_match_ipv4 (struct route_table *table, struct in_addr *addr)
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
struct route_node * struct route_node *
route_node_match_ipv6 (struct route_table *table, struct in6_addr *addr) route_node_match_ipv6 (const struct route_table *table,
const struct in6_addr *addr)
{ {
struct prefix_ipv6 p; struct prefix_ipv6 p;

12
lib/table.h
View File

@ -66,13 +66,13 @@ extern struct route_node *route_node_get (struct route_table *,
extern struct route_node *route_node_lookup (struct route_table *, extern struct route_node *route_node_lookup (struct route_table *,
struct prefix *); struct prefix *);
extern struct route_node *route_lock_node (struct route_node *node); extern struct route_node *route_lock_node (struct route_node *node);
extern struct route_node *route_node_match (struct route_table *, extern struct route_node *route_node_match (const struct route_table *,
struct prefix *); const struct prefix *);
extern struct route_node *route_node_match_ipv4 (struct route_table *, extern struct route_node *route_node_match_ipv4 (const struct route_table *,
struct in_addr *); const struct in_addr *);
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
extern struct route_node *route_node_match_ipv6 (struct route_table *, extern struct route_node *route_node_match_ipv6 (const struct route_table *,
struct in6_addr *); const struct in6_addr *);
#endif /* HAVE_IPV6 */ #endif /* HAVE_IPV6 */
#endif /* _ZEBRA_TABLE_H */ #endif /* _ZEBRA_TABLE_H */