X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/273460ed8819ec1434ef26ff54d931fe284cb8ce..9ab2f1792276f15e9d7082433bfe9f4d988bd51a:/missing/inet_ntop.c diff --git a/missing/inet_ntop.c b/missing/inet_ntop.c index d17d5925..8c6f7eb8 100644 --- a/missing/inet_ntop.c +++ b/missing/inet_ntop.c @@ -36,17 +36,13 @@ * SUCH DAMAGE. */ -/* $Id: inet_ntop.c,v 1.8 2005-02-09 02:25:46 guy Exp $ */ - -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.8 2005-02-09 02:25:46 guy Exp $"; +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include #include -#include /* * @@ -126,7 +122,9 @@ inet_ntop_v6 (const u_char *src, char *dst, size_t size) for (i = 0; i < IN6ADDRSZ; i++) words[i/2] |= (src[i] << ((1 - (i % 2)) << 3)); + best.len = 0; best.base = -1; + cur.len = 0; cur.base = -1; for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { @@ -180,7 +178,7 @@ inet_ntop_v6 (const u_char *src, char *dst, size_t size) tp += strlen(tp); break; } - tp += sprintf (tp, "%lX", words[i]); + tp += sprintf (tp, "%lx", words[i]); } /* Was it a trailing run of 0x00's? @@ -197,7 +195,6 @@ inet_ntop_v6 (const u_char *src, char *dst, size_t size) return (NULL); } return strcpy (dst, tmp); - return (NULL); } #endif /* INET6 */