Fri Sep 30 06:16:47 2016 UTC ()

Be consistent about returning -1 on error. Don't return random errnos
instead.


(dholland)

diff -r1.11 -r1.12 src/lib/libc/gen/sysctlgetmibinfo.c

--- src/lib/libc/gen/sysctlgetmibinfo.c 2014/05/16 12:22:32	1.11
+++ src/lib/libc/gen/sysctlgetmibinfo.c 2016/09/30 06:16:47	1.12

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysctlgetmibinfo.c,v 1.11 2014/05/16 12:22:32 martin Exp $ */
+/*	$NetBSD: sysctlgetmibinfo.c,v 1.12 2016/09/30 06:16:47 dholland Exp $ */
 /*-
  * Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
  *	All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.11 2014/05/16 12:22:32 martin Exp $");
+__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.12 2016/09/30 06:16:47 dholland Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifndef RUMP_ACTION
 #include "namespace.h"
 #ifdef _REENTRANT
 #include "reentrant.h"
 #endif /* _REENTRANT */
 #endif /* RUMP_ACTION */
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <assert.h>
 #include <errno.h>
 @@ -411,40 +411,47 @@ sysctlgetmibinfo_unlocked(const char *gn
 	struct sysctlnode *pnode, *node;
 	int name[CTL_MAXNAME], n, haven;
 	u_int ni, nl;
 	intmax_t q;
 	char sep[2], token[SYSCTL_NAMELEN],
 		pname[SYSCTL_NAMELEN * CTL_MAXNAME + CTL_MAXNAME];
 	const char *piece, *dot;
 	char *t;
 	size_t l;
 	if (rnode != NULL) {
 		if (*rnode == NULL) {
 			/* XXX later deal with dealing back a sub version */
-			if (v != SYSCTL_VERSION)
+			if (v != SYSCTL_VERSION) {
-				return (EINVAL);
+				errno = EINVAL;
 				return -1;
+			}
 			pnode = &sysctl_mibroot;
+		}
 		else {
 			/* this is just someone being silly */
-			if (SYSCTL_VERS((*rnode)->sysctl_flags) != (uint32_t)v)
+			if (SYSCTL_VERS((*rnode)->sysctl_flags)
-				return (EINVAL);
+			    != (uint32_t)v) {
 				errno = EINVAL;
 				return -1;
+			}
 			/* XXX later deal with other people's trees */
 			if (SYSCTL_VERS((*rnode)->sysctl_flags) !=
-			    SYSCTL_VERSION)
+			    SYSCTL_VERSION) {
-				return (EINVAL);
+				errno = EINVAL;
 				return -1;
+			}
 			pnode = *rnode;
+		}
+	}
 	else
 		pnode = &sysctl_mibroot;
 	if (pnode == &sysctl_mibroot)
 		relearnhead();
 	nl = ni = 0;
 	token[0] = '\0';
 	pname[0] = '\0';