diff options
author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
---|---|---|
committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
commit | 1173d5eff8dc423c129f442023419436ee94db23 (patch) | |
tree | 57c2bcdc1429b2e80b91a387cd1dc561dab988eb /usr.sbin/bind/lib/lwres/lwinetntop.c | |
parent | e4a92ccc5f8c866478b32a346c71150a2cdf5001 (diff) |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/lib/lwres/lwinetntop.c')
-rw-r--r-- | usr.sbin/bind/lib/lwres/lwinetntop.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/bind/lib/lwres/lwinetntop.c b/usr.sbin/bind/lib/lwres/lwinetntop.c index 97aa462a19c..08f7d1945cd 100644 --- a/usr.sbin/bind/lib/lwres/lwinetntop.c +++ b/usr.sbin/bind/lib/lwres/lwinetntop.c @@ -15,9 +15,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ +/*! \file lwinetntop.c + */ #if defined(LIBC_SCCS) && !defined(lint) static char rcsid[] = - "$ISC: lwinetntop.c,v 1.9.12.5 2005/11/04 00:16:34 marka Exp $"; + "$ISC: lwinetntop.c,v 1.12.18.4 2005/11/03 23:02:24 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <config.h> @@ -45,7 +47,7 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size); #endif -/* char * +/*! char * * lwres_net_ntop(af, src, dst, size) * convert a network format address to presentation format. * return: @@ -69,7 +71,7 @@ lwres_net_ntop(int af, const void *src, char *dst, size_t size) { /* NOTREACHED */ } -/* const char * +/*! const char * * inet_ntop4(src, dst, size) * format an IPv4 address * return: @@ -98,7 +100,7 @@ inet_ntop4(const unsigned char *src, char *dst, size_t size) { return (dst); } -/* const char * +/*! const char * * inet_ntop6(src, dst, size) * convert IPv6 binary address into presentation (printable) format * author: @@ -107,7 +109,7 @@ inet_ntop4(const unsigned char *src, char *dst, size_t size) { #ifdef AF_INET6 static const char * inet_ntop6(const unsigned char *src, char *dst, size_t size) { - /* + /*! * Note that int32_t and int16_t need only be "at least" large enough * to contain a value of the specified size. On some systems, like * Crays, there is no such thing as an integer variable with 16 bits. |