Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unneeded code, and kill parens from return

This commit is contained in:
christos 2014-02-10 16:30:54 +00:00
parent 72d54c1762
commit 3c501c2028
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libc/inet/inet_ntop.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inet_ntop.c,v 1.10 2014/02/10 16:29:30 christos Exp $ */
/* $NetBSD: inet_ntop.c,v 1.11 2014/02/10 16:30:54 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -22,7 +22,7 @@
#if 0
static const char rcsid[] = "Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp";
#else
__RCSID("$NetBSD: inet_ntop.c,v 1.10 2014/02/10 16:29:30 christos Exp $");
__RCSID("$NetBSD: inet_ntop.c,v 1.11 2014/02/10 16:30:54 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -74,12 +74,12 @@ inet_ntop(int af, const void *src, char *dst, socklen_t size)
switch (af) {
case AF_INET:
return (inet_ntop4(src, dst, size));
return inet_ntop4(src, dst, size);
case AF_INET6:
return (inet_ntop6(src, dst, size));
return inet_ntop6(src, dst, size);
default:
errno = EAFNOSUPPORT;
return (NULL);
return NULL;
}
/* NOTREACHED */
}
@ -106,12 +106,10 @@ inet_ntop4(const u_char *src, char *dst, socklen_t size)
l = snprintf(tmp, sizeof(tmp), "%u.%u.%u.%u",
src[0], src[1], src[2], src[3]);
if (l <= 0 || (socklen_t) l >= size) {
errno = ENOSPC;
return (NULL);
}
if (l <= 0 || (socklen_t) l >= size)
return NULL;
strlcpy(dst, tmp, size);
return (dst);
return dst;
}
/* const char *
@ -224,7 +222,7 @@ inet_ntop6(const u_char *src, char *dst, socklen_t size)
if ((size_t)(tp - tmp) > size)
goto out;
strlcpy(dst, tmp, size);
return (dst);
return dst;
out:
errno = ENOSPC;
return NULL;