 @@ -1,14 +1,14 @@
-/*	$NetBSD: atoint.c,v 1.1.1.1 2009/12/13 16:55:01 kardel Exp $	*/
+/*	$NetBSD: atoint.c,v 1.2 2009/12/14 00:38:48 christos Exp $	*/
 /*
  * atoint - convert an ascii string to a signed long, with error checking
  */
 #include <sys/types.h>
 #include <ctype.h>
 #include "ntp_types.h"
 #include "ntp_stdlib.h"
 int
 atoint(
 	const char *str,
 @@ -26,27 +26,27 @@ atoint(
 		cp++;
 		isneg = 1;
 		oflow_digit = '8';
 	} else {
 		isneg = 0;
 		oflow_digit = '7';
+	}
 	if (*cp == '\0')
 	    return 0;
 	u = 0;
 	while (*cp != '\0') {
-		if (!isdigit((int)*cp))
+		if (!isdigit((unsigned char)*cp))
 		    return 0;
 		if (u > 214748364 || (u == 214748364 && *cp > oflow_digit))
 		    return 0;	/* overflow */
 		u = (u << 3) + (u << 1);
 		u += *cp++ - '0';	/* ascii dependent */
+	}
 	if (isneg)
 	    *ival = -u;
 	else
 	    *ival = u;
 	return 1;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atolfp.c,v 1.1.1.1 2009/12/13 16:55:01 kardel Exp $	*/
+/*	$NetBSD: atolfp.c,v 1.2 2009/12/14 00:38:48 christos Exp $	*/
 /*
  * atolfp - convert an ascii string to an l_fp number
  */
 #include <stdio.h>
 #include <ctype.h>
 #include "ntp_fp.h"
 #include "ntp_string.h"
 #include "ntp_assert.h"
 /*
  * Powers of 10
 @@ -43,62 +43,62 @@ atolfp(
 	NTP_REQUIRE(str != NULL);
 	isneg = 0;
 	dec_i = dec_f = 0;
 	ndec = 0;
 	cp = str;
 	/*
 	 * We understand numbers of the form:
+	 *
 	 * [spaces][-|+][digits][.][digits][spaces|\n|\0]
 	 */
-	while (isspace((int)*cp))
+	while (isspace((unsigned char)*cp))
 	    cp++;
 	if (*cp == '-') {
 		cp++;
 		isneg = 1;
+	}
 	if (*cp == '+')
 	    cp++;
-	if (*cp != '.' && !isdigit((int)*cp))
+	if (*cp != '.' && !isdigit((unsigned char)*cp))
 	    return 0;
 	while (*cp != '\0' && (ind = strchr(digits, *cp)) != NULL) {
 		dec_i = (dec_i << 3) + (dec_i << 1);	/* multiply by 10 */
 		dec_i += (ind - digits);
 		cp++;
+	}
-	if (*cp != '\0' && !isspace((int)*cp)) {
+	if (*cp != '\0' && !isspace((unsigned char)*cp)) {
 		if (*cp++ != '.')
 		    return 0;
 		while (ndec < 9 && *cp != '\0'
 		       && (ind = strchr(digits, *cp)) != NULL) {
 			ndec++;
 			dec_f = (dec_f << 3) + (dec_f << 1);	/* *10 */
 			dec_f += (ind - digits);
 			cp++;
+		}
-		while (isdigit((int)*cp))
+		while (isdigit((unsigned char)*cp))
 		    cp++;
-		if (*cp != '\0' && !isspace((int)*cp))
+		if (*cp != '\0' && !isspace((unsigned char)*cp))
 		    return 0;
+	}
 	if (ndec > 0) {
 		register u_long tmp;
 		register u_long bit;
 		register u_long ten_fact;
 		ten_fact = ten_to_the_n[ndec];
 		tmp = 0;
 		bit = 0x80000000;
 		while (bit != 0) {

 @@ -1,37 +1,37 @@
-/*	$NetBSD: atouint.c,v 1.1.1.1 2009/12/13 16:55:01 kardel Exp $	*/
+/*	$NetBSD: atouint.c,v 1.2 2009/12/14 00:38:48 christos Exp $	*/
 /*
  * atouint - convert an ascii string to an unsigned long, with error checking
  */
 #include <sys/types.h>
 #include <ctype.h>
 #include "ntp_types.h"
 #include "ntp_stdlib.h"
 int
 atouint(
 	const char *str,
 	u_long *uval
+	)
+{
 	register u_long u;
 	register const char *cp;
 	cp = str;
 	if (*cp == '\0')
 	    return 0;
 	u = 0;
 	while (*cp != '\0') {
-		if (!isdigit((int)*cp))
+		if (!isdigit((unsigned char)*cp))
 		    return 0;
 		if (u > 429496729 || (u == 429496729 && *cp >= '6'))
 		    return 0;	/* overflow */
 		u = (u << 3) + (u << 1);
 		u += *cp++ - '0';	/* ascii dependent */
+	}
 	*uval = u;
 	return 1;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: audio.c,v 1.1.1.1 2009/12/13 16:55:01 kardel Exp $	*/
+/*	$NetBSD: audio.c,v 1.2 2009/12/14 00:38:48 christos Exp $	*/
 /*
  * audio.c - audio interface for reference clock audio drivers
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #if defined(HAVE_SYS_AUDIOIO_H) || defined(HAVE_SUN_AUDIOIO_H) || \
     defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
 #include "audio.h"
 #include "ntp_stdlib.h"
 @@ -137,50 +137,50 @@ audio_config_read(
+		}
+	}
 	printf("audio_config_read: reading <%s>\n", device);
 	while (fgets(line, sizeof line, fd)) {
 		char *cp, *cc, *ca;
 		int i;
 		/* Remove comments */
 		if ((cp = strchr(line, '#')))
 			*cp = '\0';
 		/* Remove any trailing spaces */
 		for (i = strlen(line);
-		     i > 0 && isascii((int)line[i - 1]) && isspace((int)line[i - 1]);
+		     i > 0 && isascii((unsigned char)line[i - 1]) && isspace((unsigned char)line[i - 1]);
+			)
 			line[--i] = '\0';
 		/* Remove leading space */
-		for (cc = line; *cc && isascii((int)*cc) && isspace((int)*cc); cc++)
+		for (cc = line; *cc && isascii((unsigned char)*cc) && isspace((unsigned char)*cc); cc++)
 			continue;
 		/* Stop if nothing left */
 		if (!*cc)
 			continue;
 		/* Uppercase the command and find the arg */
 		for (ca = cc; *ca; ca++) {
-			if (isascii((int)*ca)) {
+			if (isascii((unsigned char)*ca)) {
-				if (islower((int)*ca)) {
+				if (islower((unsigned char)*ca)) {
-					*ca = toupper(*ca);
+					*ca = toupper((unsigned char)*ca);
-				} else if (isspace((int)*ca) || (*ca == '='))
+				} else if (isspace((unsigned char)*ca) || (*ca == '='))
 					break;
+			}
+		}
 		/* Remove space (and possible =) leading the arg */
-		for (; *ca && isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')); ca++)
+		for (; *ca && isascii((unsigned char)*ca) && (isspace((unsigned char)*ca) || (*ca == '=')); ca++)
 			continue;
 		if (!strncmp(cc, "IDEV", (size_t) 4)) {
 			sscanf(ca, "%s", ab);
 			strcpy(cf_i_dev, ab);
 			printf("idev <%s>\n", ab);
 		} else if (!strncmp(cc, "CDEV", (size_t) 4)) {
 			sscanf(ca, "%s", ab);
 			strcpy(cf_c_dev, ab);
 			printf("cdev <%s>\n", ab);
 		} else if (!strncmp(cc, "AGC", (size_t) 3)) {
 			sscanf(ca, "%s", ab);
 			strcpy(cf_agc, ab);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hextolfp.c,v 1.1.1.1 2009/12/13 16:55:03 kardel Exp $	*/
+/*	$NetBSD: hextolfp.c,v 1.2 2009/12/14 00:38:48 christos Exp $	*/
 /*
  * hextolfp - convert an ascii hex string to an l_fp number
  */
 #include <stdio.h>
 #include <ctype.h>
 #include "ntp_fp.h"
 #include "ntp_string.h"
 #include "ntp_stdlib.h"
 int
 hextolfp(
 @@ -21,27 +21,27 @@ hextolfp(
 	register u_long dec_i;
 	register u_long dec_f;
 	char *ind = NULL;
 	static const char *digits = "0123456789abcdefABCDEF";
 	dec_i = dec_f = 0;
 	cp = str;
 	/*
 	 * We understand numbers of the form:
+	 *
 	 * [spaces]8_hex_digits[.]8_hex_digits[spaces|\n|\0]
 	 */
-	while (isspace((int)*cp))
+	while (isspace((unsigned char)*cp))
 	    cp++;
 	cpstart = cp;
 	while (*cp != '\0' && (cp - cpstart) < 8 &&
 	       (ind = strchr(digits, *cp)) != NULL) {
 		dec_i = dec_i << 4;	/* multiply by 16 */
 		dec_i += ((ind - digits) > 15) ? (ind - digits) - 6
 			: (ind - digits);
 		cp++;
+	}
 	if ((cp - cpstart) < 8 || ind == NULL)
 	    return 0;
 @@ -50,20 +50,20 @@ hextolfp(
 	cpstart = cp;
 	while (*cp != '\0' && (cp - cpstart) < 8 &&
 	       (ind = strchr(digits, *cp)) != NULL) {
 		dec_f = dec_f << 4;	/* multiply by 16 */
 		dec_f += ((ind - digits) > 15) ? (ind - digits) - 6
 			: (ind - digits);
 		cp++;
+	}
 	if ((cp - cpstart) < 8 || ind == NULL)
 	    return 0;
-	if (*cp != '\0' && !isspace((int)*cp))
+	if (*cp != '\0' && !isspace((unsigned char)*cp))
 	    return 0;
 	lfp->l_ui = dec_i;
 	lfp->l_uf = dec_f;
 	return 1;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mstolfp.c,v 1.1.1.1 2009/12/13 16:55:04 kardel Exp $	*/
+/*	$NetBSD: mstolfp.c,v 1.2 2009/12/14 00:38:48 christos Exp $	*/
 /*
  * mstolfp - convert an ascii string in milliseconds to an l_fp number
  */
 #include <stdio.h>
 #include <ctype.h>
 #include "ntp_fp.h"
 #include "ntp_stdlib.h"
 int
 mstolfp(
 	const char *str,
 @@ -23,43 +23,43 @@ mstolfp(
 	/*
 	 * We understand numbers of the form:
+	 *
 	 * [spaces][-][digits][.][digits][spaces|\n|\0]
+	 *
 	 * This is one enormous hack.  Since I didn't feel like
 	 * rewriting the decoding routine for milliseconds, what
 	 * is essentially done here is to make a copy of the string
 	 * with the decimal moved over three places so the seconds
 	 * decoding routine can be used.
 	 */
 	bp = buf;
 	cp = str;
-	while (isspace((int)*cp))
+	while (isspace((unsigned char)*cp))
 	    cp++;
 	if (*cp == '-') {
 		*bp++ = '-';
 		cp++;
+	}
-	if (*cp != '.' && !isdigit((int)*cp))
+	if (*cp != '.' && !isdigit((unsigned char)*cp))
 	    return 0;
 	/*
 	 * Search forward for the decimal point or the end of the string.
 	 */
 	cpdec = cp;
-	while (isdigit((int)*cpdec))
+	while (isdigit((unsigned char)*cpdec))
 	    cpdec++;
 	/*
 	 * Found something.  If we have more than three digits copy the
 	 * excess over, else insert a leading 0.
 	 */
 	if ((cpdec - cp) > 3) {
 		do {
 			*bp++ = (char)*cp++;
 		} while ((cpdec - cp) > 3);
 	} else {
 		*bp++ = '0';
+	}
 @@ -77,26 +77,26 @@ mstolfp(
 			*bp++ = '0';
 		} while (--i > 0);
+	}
 	/*
 	 * Copy the remainder up to the millisecond decimal.  If cpdec
 	 * is pointing at a decimal point, copy in the trailing number too.
 	 */
 	while (cp < cpdec)
 	    *bp++ = (char)*cp++;
 	if (*cp == '.') {
 		cp++;
-		while (isdigit((int)*cp))
+		while (isdigit((unsigned char)*cp))
 		    *bp++ = (char)*cp++;
+	}
 	*bp = '\0';
 	/*
 	 * Check to make sure the string is properly terminated.  If
 	 * so, give the buffer to the decoding routine.
 	 */
-	if (*cp != '\0' && !isspace((int)*cp))
+	if (*cp != '\0' && !isspace((unsigned char)*cp))
 	    return 0;
 	return atolfp(buf, lfp);
+}

 @@ -1,37 +1,37 @@
-/*	$NetBSD: octtoint.c,v 1.1.1.1 2009/12/13 16:55:04 kardel Exp $	*/
+/*	$NetBSD: octtoint.c,v 1.2 2009/12/14 00:38:48 christos Exp $	*/
 /*
  * octtoint - convert an ascii string in octal to an unsigned
  *	      long, with error checking
  */
 #include <stdio.h>
 #include <ctype.h>
 #include "ntp_stdlib.h"
 int
 octtoint(
 	const char *str,
 	u_long *ival
+	)
+{
 	register u_long u;
 	register const char *cp;
 	cp = str;
 	if (*cp == '\0')
 	    return 0;
 	u = 0;
 	while (*cp != '\0') {
-		if (!isdigit((int)*cp) || *cp == '8' || *cp == '9')
+		if (!isdigit((unsigned char)*cp) || *cp == '8' || *cp == '9')
 		    return 0;
 		if (u >= 0x20000000)
 		    return 0;	/* overflow */
 		u <<= 3;
 		u += *cp++ - '0';	/* ascii dependent */
+	}
 	*ival = u;
 	return 1;
+}