CVS commit: src/lib/libc/inet

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Mon Feb 10 16:30:54 UTC 2014

Modified Files:
        src/lib/libc/inet: inet_ntop.c

Log Message:
remove unneeded code, and kill parens from return


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/inet/inet_ntop.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/lib/libc/inet/inet_ntop.c
diff -u src/lib/libc/inet/inet_ntop.c:1.10 src/lib/libc/inet/inet_ntop.c:1.11
--- src/lib/libc/inet/inet_ntop.c:1.10	Mon Feb 10 11:29:30 2014
+++ src/lib/libc/inet/inet_ntop.c	Mon Feb 10 11:30:54 2014
@@ -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 
 
 	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,
 
 	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,
 	if ((size_t)(tp - tmp) > size)
 		goto out;
 	strlcpy(dst, tmp, size);
-	return (dst);
+	return dst;
 out:
 	errno = ENOSPC;
 	return NULL;