6289479 libresolv2 clean up and alignment with libbind.6.0

1 files changed, 19 insertions, 23 deletions

diff --git a/usr/src/lib/libresolv2/common/isc/hex.c b/usr/src/lib/libresolv2/common/isc/hex.c
index 5e1f6e8364..e43be4f3b5 100644
--- a/usr/src/lib/libresolv2/common/isc/hex.c
+++ b/usr/src/lib/libresolv2/common/isc/hex.c
@@ -1,27 +1,20 @@
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001 by Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <port_before.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -40,7 +33,7 @@ isc_gethexstring(unsigned char *buf, size_t len, int count, FILE *fp,
 	char *s;
 	int result = count;
 	
-	x = 0; /* silence compiler */
+	x = 0; /*%< silence compiler */
 	n = 0;
 	while (count > 0) {
 		c = fgetc(fp);
@@ -52,8 +45,9 @@ isc_gethexstring(unsigned char *buf, size_t len, int count, FILE *fp,
 			goto formerr;
 		/* comment */
 		if (c == ';') {
-			while ((c = fgetc(fp)) != EOF && c != '\n')
-				/* empty */
+			do {
+				c = fgetc(fp);
+			} while (c != EOF && c != '\n');
 			if (c == '\n' && *multiline)
 				continue;
 			goto formerr;
@@ -70,7 +64,7 @@ isc_gethexstring(unsigned char *buf, size_t len, int count, FILE *fp,
 			goto formerr;
 		x = (x<<4) | (s - hex);
 		if (++n == 2) {
-			if (len > 0) {
+			if (len > 0U) {
 				*buf++ = x;
 				len--;
 			} else
@@ -93,11 +87,11 @@ isc_puthexstring(FILE *fp, const unsigned char *buf, size_t buflen,
 {
 	size_t i = 0;
 
-	if (len1 < 4)
+	if (len1 < 4U)
 		len1 = 4;
-	if (len2 < 4)
+	if (len2 < 4U)
 		len2 = 4;
-	while (buflen > 0) {
+	while (buflen > 0U) {
 		fputc(hex[(buf[0]>>4)&0xf], fp);
 		fputc(hex[buf[0]&0xf], fp);
 		i += 2;
@@ -113,7 +107,7 @@ isc_puthexstring(FILE *fp, const unsigned char *buf, size_t buflen,
 
 void
 isc_tohex(const unsigned char *buf, size_t buflen, char *t) {
-	while (buflen > 0) {
+	while (buflen > 0U) {
 		*t++ = hex[(buf[0]>>4)&0xf];
 		*t++ = hex[buf[0]&0xf];
 		buf++;
@@ -121,3 +115,5 @@ isc_tohex(const unsigned char *buf, size_t buflen, char *t) {
 	}
 	*t = '\0';
 }
+
+/*! \file */