From ce58934c26f217ac83da72bdcf78eaadc9efd26a Mon Sep 17 00:00:00 2001 From: luigi Date: Tue, 13 Apr 2004 11:24:43 +0000 Subject: Replace ROUNDUP/ADVANCE with SA_SIZE --- sbin/routed/if.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'sbin/routed') diff --git a/sbin/routed/if.c b/sbin/routed/if.c index be380b8..ef8e4f4 100644 --- a/sbin/routed/if.c +++ b/sbin/routed/if.c @@ -637,29 +637,14 @@ rt_xaddrs(struct rt_addrinfo *info, #ifdef _HAVE_SA_LEN static struct sockaddr sa_zero; #endif -#ifdef sgi -#define ROUNDUP(a) ((a) > 0 ? (1 + (((a) - 1) | (sizeof(__uint64_t) - 1))) \ - : sizeof(__uint64_t)) -#else -#define ROUNDUP(a) ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) \ - : sizeof(long)) -#endif - memset(info, 0, sizeof(*info)); info->rti_addrs = addrs; for (i = 0; i < RTAX_MAX && sa < lim; i++) { if ((addrs & (1 << i)) == 0) continue; -#ifdef _HAVE_SA_LEN info->rti_info[i] = (sa->sa_len != 0) ? sa : &sa_zero; - sa = (struct sockaddr *)((char*)(sa) - + ROUNDUP(sa->sa_len)); -#else - info->rti_info[i] = sa; - sa = (struct sockaddr *)((char*)(sa) - + ROUNDUP(_FAKE_SA_LEN_DST(sa))); -#endif + sa = (struct sockaddr *)((char*)(sa) + SA_SIZE(sa)); } } -- cgit v1.1