diff options
| author | dougb <dougb@FreeBSD.org> | 2005-03-17 08:04:02 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2005-03-17 08:04:02 +0000 |
| commit | 6c00746d362144ea66eb0e93ad2dca75df176135 (patch) | |
| tree | 56538def4af42f6875185c84274a942bf33b5d24 /contrib/bind9/lib/bind/inet/inet_makeaddr.c | |
| parent | 46172d5768cf5570203b7b39866b786fec8be024 (diff) | |
| download | FreeBSD-src-6c00746d362144ea66eb0e93ad2dca75df176135.zip FreeBSD-src-6c00746d362144ea66eb0e93ad2dca75df176135.tar.gz | |
Vendor import of BIND 9.3.1
Diffstat (limited to 'contrib/bind9/lib/bind/inet/inet_makeaddr.c')
| -rw-r--r-- | contrib/bind9/lib/bind/inet/inet_makeaddr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/bind9/lib/bind/inet/inet_makeaddr.c b/contrib/bind9/lib/bind/inet/inet_makeaddr.c index 1d20619..6e4ecc3 100644 --- a/contrib/bind9/lib/bind/inet/inet_makeaddr.c +++ b/contrib/bind9/lib/bind/inet/inet_makeaddr.c @@ -51,16 +51,16 @@ struct in_addr inet_makeaddr(net, host) u_long net, host; { - u_long addr; + struct in_addr a; if (net < 128U) - addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST); + a.s_addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST); else if (net < 65536U) - addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST); + a.s_addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST); else if (net < 16777216L) - addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST); + a.s_addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST); else - addr = net | host; - addr = htonl(addr); - return (*(struct in_addr *)&addr); + a.s_addr = net | host; + a.s_addr = htonl(a.s_addr); + return (a); } |
