[illumos-gate merge]

commit 739415d128746863863f9005c1923d9f5dd397e4
    8916 man pages should refer to our own Dynamic Tracing Guide
    8915 remove reference to kgmon in lockstat(1m)
commit 435a78cc932ae710cfa076091a136712cf13ccf2
    8885 64-bit libbsm:adt_do_ipv[46]_address creates non-compressible at_port.
commit f6969e9b236c140638ae16b1d5c8dff401e31465
    8848 hbaapi: variable set but not used
commit 4c307623be8d9c2d69ed7e8622a1ab0a6348d0dd
    8843 libnls: variable 'version' set but not used
commit 19700af4088d99a0f173873dcdfcf51fdb90335b
    8830 libshell: variable set but not used
commit 1d6eba5f15dcb03614b687ec6ddaa6477b7baa41
    8823 print: variable 'error' set but not used
commit a1a46df055863a267eb7a80b7961c9379bc457ec
    8822 libsmbfs: variable set but not used
commit 8f33f62fe3b6ef9b5f9a849a5d2081f34e048be2
    8819 x86 unix: variable set but not used
commit ea6a05275c5cbe13e3a79eb7efb3a0a097613149
    8813 rdsv3: variable 'timeo' set but not used
commit 8b9a0f1ef5cee53073074965f0ea1d015d66926f
    8812 xge: variable set but not used
commit a3907569cb648b92b09b4854131a106aafecab36
    8911 loader: move ficl outb and inb into libi386

1 files changed, 34 insertions, 24 deletions

diff --git a/usr/src/lib/libnls/common/nlsrequest.c b/usr/src/lib/libnls/common/nlsrequest.c
index 547aeff2f2..b7965646d5 100644
--- a/usr/src/lib/libnls/common/nlsrequest.c
+++ b/usr/src/lib/libnls/common/nlsrequest.c
@@ -22,9 +22,6 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
-#ident	"%Z%%M%	%I%	%E% SMI"        /* SVr4.0 1.5.1.1	*/
-
 /*
  *
  * nlsrequest(3):
@@ -67,7 +64,7 @@ nlsrequest(int fd, char *svc_code)
 	int	len, err, flags;
 	char 	buf[256];
 	char	*p;
-	int	version, ret;
+	int	ret;
 	extern  int t_errno;
 
 	t_errno = 0;		/* indicates a 'name' problem	*/
@@ -79,55 +76,68 @@ nlsrequest(int fd, char *svc_code)
 
 	if (!svc_code || !strlen(svc_code) ||
 	    (strlen(svc_code) >= (size_t)SVC_CODE_SZ)) {
-		if (_nlslog)
-			fprintf(stderr, "nlsrequest: invalid service code format\n");
-		return(-1);
+		if (_nlslog) {
+			fprintf(stderr,
+			    "nlsrequest: invalid service code format\n");
+		}
+		return (-1);
 	}
 
 	/*
 	 * send protocol message requesting the service
 	 */
 
-	len = sprintf(buf, nls_v2_msg, svc_code)+1;/* inc trailing null */
+	len = sprintf(buf, nls_v2_msg, svc_code) + 1; /* inc trailing null */
 
 	if (t_snd(fd, buf, len, 0) < len) {
 		if (_nlslog)
 			t_error("t_snd of listener request message failed");
-		return(-1);
+		return (-1);
 	}
 
 	p = _nlsbuf;
 	len = 0;
 
 	do {
-		if (++len > sizeof(_nlsbuf)) {
-			if (_nlslog)
-				fprintf(stderr, "nlsrequest: _nlsbuf not large enough\n");
-			return(-1);
+		if (++len > sizeof (_nlsbuf)) {
+			if (_nlslog) {
+				fprintf(stderr,
+				    "nlsrequest: _nlsbuf not large enough\n");
+			}
+			return (-1);
 		}
-		if (t_rcv(fd, p, sizeof(char), &flags) != sizeof(char)) {
-			if (_nlslog)
-				t_error("t_rcv of listener response msg failed");
-			return(-1);
+		if (t_rcv(fd, p, sizeof (char), &flags) != sizeof (char)) {
+			if (_nlslog) {
+				t_error("t_rcv of listener response msg "
+				    "failed");
+			}
+			return (-1);
 		}
 
 	} while (*p++ != '\0');
 
 
-	if ((p = strtok(_nlsbuf, ":")) == (char *)0)
+	if ((p = strtok(_nlsbuf, ":")) == NULL)
 		goto parsefail;
-	version = atoi(p);
 
-	if ((p = strtok((char *)0, ":")) == (char *)0)
+	/*
+	 * We ignore the version number here as we do not have any use for it.
+	 * Previous versions of the code looked at it by calling atoi() on it,
+	 * which did not mutate the actual string and did not use it.
+	 */
+
+	if ((p = strtok(NULL, ":")) ==  NULL)
 		goto parsefail;
 	ret = atoi(p);
 	_nlsrmsg = p + strlen(p) + 1;
 	if (ret && _nlslog)
 		fprintf(stderr, "%s\n", _nlsrmsg); /* debug only */
-	return(ret);
+	return (ret);
 
 parsefail:
-	if (_nlslog)
-		fprintf(stderr, "nlsrequest: failed parse of response message\n");
-	return(-1);
+	if (_nlslog) {
+		fprintf(stderr,
+		    "nlsrequest: failed parse of response message\n");
+	}
+	return (-1);
 }