From 8cc4198f9fabe5f10f5a773de1503d82f33a01fb Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 6 May 2005 21:25:49 +0000 Subject: 2005-05-06 Paul Jakma * (general) extern and static'ification of functions in code and header. Cleanup any definitions with unspecified arguments. Add casts for callback assignments where the callback is defined, typically, as passing void *, but the function being assigned has some other pointer type defined as its argument, as gcc complains about casts from void * to X* via function arguments. Fix some old K&R style function argument definitions. Add noreturn gcc attribute to some functions, as appropriate. Add unused gcc attribute to some functions (eg ones meant to help while debugging) Add guard defines to headers which were missing them. * command.c: (install_node) add const qualifier, still doesnt shut up the warning though, because of the double pointer. (cmp_node) ditto * keychain.c: (key_str2time) Add GET_LONG_RANGE() macro, derived fromn vty.h ones to fix some of the (long) < 0 warnings. * thread.c: (various) use thread_empty (cpu_record_hash_key) should cast to uintptr_t, a stdint.h type * vty.h: Add VTY_GET_IPV4_ADDRESS and VTY_GET_IPV4_PREFIX so they removed from ospfd/ospf_vty.h * zebra.h: Move definition of ZEBRA_PORT to here, to remove dependence of lib on zebra/zserv.h --- lib/prefix.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/prefix.c') diff --git a/lib/prefix.c b/lib/prefix.c index 2e594aa0..b4347dd2 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -72,8 +72,8 @@ prefix_match (const struct prefix *n, const struct prefix *p) int shift; /* Set both prefix's head pointer. */ - u_char *np = (u_char *)&n->u.prefix; - u_char *pp = (u_char *)&p->u.prefix; + const u_char *np = (const u_char *)&n->u.prefix; + const u_char *pp = (const u_char *)&p->u.prefix; /* If n's prefix is longer than p's one return 0. */ if (n->prefixlen > p->prefixlen) @@ -160,8 +160,8 @@ prefix_cmp (const struct prefix *p1, const struct prefix *p2) int shift; /* Set both prefix's head pointer. */ - u_char *pp1 = (u_char *)&p1->u.prefix; - u_char *pp2 = (u_char *)&p2->u.prefix; + const u_char *pp1 = (const u_char *)&p1->u.prefix; + const u_char *pp2 = (const u_char *)&p2->u.prefix; if (p1->family != p2->family || p1->prefixlen != p2->prefixlen) return 1; @@ -344,7 +344,7 @@ prefix_ipv4_any (const struct prefix_ipv4 *p) /* Allocate a new ip version 6 route */ struct prefix_ipv6 * -prefix_ipv6_new () +prefix_ipv6_new (void) { struct prefix_ipv6 *p; -- cgit v1.2.1