From 040064c8ab7cb95913b3318313cc4dbb1b64de1e Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 6 May 2016 19:27:16 -0400 Subject: [PATCH] quagga: Remove WEAK_ALIAS pragma usage The code was using pragma's to override function calls while there was code for platforms that don't support pragma's Just remove the pragma usage from the program in it's entirety Signed-off-by: Donald Sharp Reviewed-by: Don Slice Reviewed-by: Daniel Walton --- configure.ac | 18 +----------------- zebra/ioctl_null.c | 15 --------------- zebra/kernel_null.c | 12 ------------ zebra/misc_null.c | 8 -------- zebra/redistribute_null.c | 20 -------------------- 5 files changed, 1 insertion(+), 72 deletions(-) diff --git a/configure.ac b/configure.ac index 30fa7bd023..2ad3cc2e3c 100755 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow AC_SUBST(pkgsrcdir) AC_SUBST(pkgsrcrcdir) -LIBS="$LIBS -L/usr/include/json/ -ljson" +LIBS="$LIBS -L/usr/include/json/ -ljson-c" dnl ------------ dnl Check CFLAGS @@ -1573,22 +1573,6 @@ if test "${enable_capabilities}" != "no"; then fi AC_SUBST(LIBCAP) -dnl --------------------------------------------------------------------------- -dnl http://www.gnu.org/software/autoconf-archive/ax_sys_weak_alias.html -dnl Check for and set one of the following = 1 -dnl HAVE_SYS_WEAK_ALIAS_ATTRIBUTE -dnl HAVE_SYS_WEAK_ALIAS_PRAGMA -dnl HAVE_SYS_WEAK_ALIAS_HPSECONDARY -dnl HAVE_SYS_WEAK_ALIAS_CRIDUPLICATE -dnl If any scheme is found, set -dnl HAVE_SYS_WEAK_ALIAS=1 -dnl The following variable is set to text value -dnl WEAK_ALIAS = "attribute" || "pragma" || "hpsecondary" || "criduplicate" || "no" -dnl If weak alias can cross object file boundaries -dnl WEAK_ALIAS_CROSSFILE = "yes" || "no" -dnl --------------------------------------------------------------------------- -AX_SYS_WEAK_ALIAS - dnl --------------------------- dnl check for glibc 'backtrace' dnl --------------------------- diff --git a/zebra/ioctl_null.c b/zebra/ioctl_null.c index 5d046d36d5..71a612e209 100644 --- a/zebra/ioctl_null.c +++ b/zebra/ioctl_null.c @@ -19,29 +19,14 @@ int if_unset_prefix (struct interface *a, struct connected *b) } int if_prefix_add_ipv6 (struct interface *a, struct connected *b) { return 0; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak if_prefix_delete_ipv6 = if_prefix_add_ipv6 -#else int if_prefix_delete_ipv6 (struct interface *a, struct connected *b) { return 0; } -#endif int if_ioctl (u_long a, caddr_t b) { return 0; } int if_set_flags (struct interface *a, uint64_t b) { return 0; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak if_unset_flags = if_set_flags -#else int if_unset_flags (struct interface *a, uint64_t b) { return 0; } -#endif void if_get_flags (struct interface *a) { return; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak if_get_metric = if_get_flags -#pragma weak if_get_mtu = if_get_flags -#else -/* void if_get_metric (struct interface *a) { return; } */ -/* void if_get_mtu (struct interface *a) { return; } */ -#endif #ifdef SOLARIS_IPV6 #pragma weak if_ioctl_ipv6 = if_ioctl diff --git a/zebra/kernel_null.c b/zebra/kernel_null.c index b69ffcab64..22447a075d 100644 --- a/zebra/kernel_null.c +++ b/zebra/kernel_null.c @@ -12,19 +12,11 @@ int kernel_add_ipv4 (struct prefix *a, struct rib *b) { return 0; } int kernel_update_ipv4 (struct prefix *a, struct rib *b) { return 0; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak kernel_delete_ipv4 = kernel_add_ipv4 -#else int kernel_delete_ipv4 (struct prefix *a, struct rib *b) { return 0; } -#endif int kernel_add_ipv6 (struct prefix *a, struct rib *b) { return 0; } int kernel_update_ipv6 (struct prefix *a, struct rib *b) { return 0; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak kernel_delete_ipv6 = kernel_add_ipv6 -#else int kernel_delete_ipv6 (struct prefix *a, struct rib *b) { return 0; } -#endif int kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate, unsigned int index, int flags, int table) @@ -58,8 +50,4 @@ int netlink_neigh_update (int cmd, int ifindex, __u32 addr, char *lla, int llale void kernel_init (struct zebra_ns *zns) { return; } void kernel_terminate (struct zebra_ns *zns) { return; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak route_read = kernel_init -#else void route_read (struct zebra_ns *zns) { return; } -#endif diff --git a/zebra/misc_null.c b/zebra/misc_null.c index 6cdfb0f54c..82f66c17f5 100644 --- a/zebra/misc_null.c +++ b/zebra/misc_null.c @@ -6,16 +6,8 @@ #include "zebra/interface.h" #include "zebra/zebra_fpm.h" -static void ifstat_update_proc (void) { return; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak rtadv_config_write = ifstat_update_proc -#pragma weak irdp_config_write = ifstat_update_proc -#pragma weak ifstat_update_sysctl = ifstat_update_proc -#else void rtadv_config_write (struct vty *vty, struct interface *ifp) { return; } void irdp_config_write (struct vty *vty, struct interface *ifp) { return; } -void ifstat_update_sysctl (void) { return; } -#endif void zfpm_trigger_update (struct route_node *rn, const char *reason) diff --git a/zebra/redistribute_null.c b/zebra/redistribute_null.c index 40cb8de18d..19254c427f 100644 --- a/zebra/redistribute_null.c +++ b/zebra/redistribute_null.c @@ -7,11 +7,6 @@ void zebra_redistribute_add (int a, struct zserv *b, int c, struct zebra_vrf *zvrf) { return; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak zebra_redistribute_delete = zebra_redistribute_add -#pragma weak zebra_redistribute_default_add = zebra_redistribute_add -#pragma weak zebra_redistribute_default_delete = zebra_redistribute_add -#else void zebra_redistribute_delete (int a, struct zserv *b, int c, struct zebra_vrf *zvrf) { return; } @@ -21,43 +16,28 @@ void zebra_redistribute_default_add (int a, struct zserv *b, int c, void zebra_redistribute_default_delete (int a, struct zserv *b, int c, struct zebra_vrf *zvrf) { return; } -#endif void redistribute_update (struct prefix *a, struct rib *b, struct rib *c) { return; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak redistribute_delete = redistribute_update -#else void redistribute_delete (struct prefix *a, struct rib *b) { return; } -#endif void zebra_interface_up_update (struct interface *a) { return; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak zebra_interface_down_update = zebra_interface_up_update -#pragma weak zebra_interface_add_update = zebra_interface_up_update -#pragma weak zebra_interface_delete_update = zebra_interface_up_update -#else void zebra_interface_down_update (struct interface *a) { return; } void zebra_interface_add_update (struct interface *a) { return; } void zebra_interface_delete_update (struct interface *a) { return; } -#endif void zebra_interface_address_add_update (struct interface *a, struct connected *b) { return; } -#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak zebra_interface_address_delete_update = zebra_interface_address_add_update -#else void zebra_interface_address_delete_update (struct interface *a, struct connected *b) { return; } -#endif void zebra_interface_vrf_update_del (struct interface *a, vrf_id_t new_vrf_id) { return; } -- 2.39.5