- (bal) Cleaned out bsd-snprintf.c. VARARGS have been banished and

I did a base KNF over the whe whole file to make it more acceptable. (backed out of original patch and removed it from ChangeLog) This has been a long time coming. If we decide that we need VARARGS support we should do it at a higher level, since no where else do we support VARARGS in the code base.
2025-09-26 03:18:54 +02:00 · 2001-02-13 02:18:50 +00:00 · 2001-02-13 02:18:50 +00:00 · 6c92dab9a1
commit 6c92dab9a1
parent d8ab0d4a85
4 changed files with 577 additions and 669 deletions
--- a/7
+++ b/7
@ -1,7 +1,8 @@
 20010213
- - (bal) added NeXT work around for bsd-snprintf.c in bsd-nextstep.h.
- - (bal) added TODO item to clean up and sort out 'varargs' from 'stdargs'
 - (djm) Only test -S potential EGD sockets if they exist and are readable.
+ - (bal) Cleaned out bsd-snprintf.c.  VARARGS have been banished and
+   I did a base KNF over the whe whole file to make it more acceptable.
+   (backed out of original patch and removed it from ChangeLog)

 20010212
 - (djm) Update Redhat specfile to allow --define "skip_x11_askpass 1", 
@ -3909,4 +3910,4 @@
 - Wrote replacements for strlcpy and mkdtemp
 - Released 1.0pre1

-$Id: ChangeLog,v 1.751 2001/02/13 01:11:17 djm Exp $
+$Id: ChangeLog,v 1.752 2001/02/13 02:18:50 mouring Exp $
--- a/5
+++ b/5
@ -29,9 +29,6 @@ Programming:
 - Verify that It's safe to enable NGROUPS_MAX under NeXTStep for
  groupaccess features. (mouring@eviladmin.org)

- Clean up bsd-snprintf.c  and sort out how to detect between VARARGS
-  and STDARGS for better portablity (mouring@eviladmin.org)
-
 Documentation:
 - More and better

@ -65,4 +62,4 @@ Packaging:
 - HP/UX: Provide DEPOT package scripts.
  (gilbert.r.loomis@saic.com)

-$Id: TODO,v 1.34 2001/02/12 15:57:18 mouring Exp $
+$Id: TODO,v 1.35 2001/02/13 02:18:50 mouring Exp $
--- a/openbsd-compat/bsd-nextstep.h
+++ b/openbsd-compat/bsd-nextstep.h
@ -21,7 +21,7 @@
 *
 */

-/* $Id: bsd-nextstep.h,v 1.3 2001/02/12 15:57:18 mouring Exp $ */
+/* $Id: bsd-nextstep.h,v 1.4 2001/02/13 02:18:50 mouring Exp $ */

 #ifndef _NEXT_POSIX_H
 #define _NEXT_POSIX_H
@ -29,12 +29,6 @@
 #ifdef HAVE_NEXT
 #include <sys/dir.h>

-/* 
- * Temporary hack to let bsd-snprintf.c work.  bsd-snprintf.c really
- * needs to be cleaned up.
- */
-#define HAVE_STDARG_H 1
-
 /* NeXT's readdir() is BSD (struct direct) not POSIX (struct dirent) */
 #define dirent direct

--- a/openbsd-compat/bsd-snprintf.c
+++ b/openbsd-compat/bsd-snprintf.c
@ -38,60 +38,37 @@
 *    missing.  Some systems only have snprintf() but not vsnprintf(), so
 *    the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.
 *
- *  Ben Lindstrom <mouring@pconline.com> 09/27/00 for OpenSSH
+ *  Ben Lindstrom <mouring@eviladmin.org> 09/27/00 for OpenSSH
 *    Welcome to the world of %lld and %qd support.  With other
 *    long long support.  This is needed for sftp-server to work
 *    right.
+ *
+ *  Ben Lindstrom <mouring@eviladmin.org> 02/12/01 for OpenSSH
+ *    Removed all hint of VARARGS stuff and banished it to the void,
+ *    and did a bit of KNF style work to make things a bit more
+ *    acceptable.  Consider stealing from mutt or enlightenment.
 **************************************************************/

 #include "includes.h"

-RCSID("$Id: bsd-snprintf.c,v 1.2 2001/02/09 01:55:36 djm Exp $");
+RCSID("$Id: bsd-snprintf.c,v 1.3 2001/02/13 02:18:50 mouring Exp $");

 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)

-#include <string.h>
-# include <ctype.h>
-#include <sys/types.h>
+static void 
+dopr(char *buffer, size_t maxlen, const char *format, va_list args);

-/* Define this as a fall through, HAVE_STDARG_H is probably already set */
+static void 
+fmtstr(char *buffer, size_t *currlen, size_t maxlen, char *value, int flags, 
+       int min, int max);

-#define HAVE_VARARGS_H
+static void 
+fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base, 
+       int min, int max, int flags);

-/* varargs declarations: */
-
-#if defined(HAVE_STDARG_H)
-# include <stdarg.h>
-# define HAVE_STDARGS    /* let's hope that works everywhere (mj) */
-# define VA_LOCAL_DECL   va_list ap
-# define VA_START(f)     va_start(ap, f)
-# define VA_SHIFT(v,t)  ;   /* no-op for ANSI */
-# define VA_END          va_end(ap)
-#else
-# if defined(HAVE_VARARGS_H)
-#  include <varargs.h>
-#  undef HAVE_STDARGS
-#  define VA_LOCAL_DECL   va_list ap
-#  define VA_START(f)     va_start(ap)      /* f is ignored! */
-#  define VA_SHIFT(v,t) v = va_arg(ap,t)
-#  define VA_END        va_end(ap)
-# else
-/*XX ** NO VARARGS ** XX*/
-# endif
-#endif
-
-/*int snprintf (char *str, size_t count, const char *fmt, ...);*/
-/*int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);*/
-
-static void dopr (char *buffer, size_t maxlen, const char *format, 
-                  va_list args);
-static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
-		    char *value, int flags, int min, int max);
-static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
-		    long value, int base, int min, int max, int flags);
-static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
-		   long double fvalue, int min, int max, int flags);
-static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c );
+static void 
+fmtfp(char *buffer, size_t *currlen, size_t maxlen, long double fvalue, 
+      int min, int max, int flags);

 /*
 * dopr(): poor man's version of doprintf
@ -123,35 +100,30 @@ static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c );
 #define DP_C_LONG_LONG 4

 #define char_to_int(p) (p - '0')
-#ifndef MAX
-# define MAX(p,q) ((p >= q) ? p : q)
-#endif
+#define abs_val(p) (p < 0 ? -p : p)

-static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
+
+static void 
+dopr(char *buffer, size_t maxlen, const char *format, va_list args)
 {
+	char *strvalue;
 	char ch;
 	long value;
 	long double fvalue;
-  char *strvalue;
-  int min;
-  int max;
-  int state;
-  int flags;
-  int cflags;
-  size_t currlen;
+	int min = 0;
+	int max = -1;
+	int state = DP_S_DEFAULT;
+	int flags = 0;
+	int cflags = 0;
+	size_t currlen = 0;
  
-  state = DP_S_DEFAULT;
-  currlen = flags = cflags = min = 0;
-  max = -1;
 	ch = *format++;

-  while (state != DP_S_DONE)
-  {
+	while (state != DP_S_DONE) {
 		if ((ch == '\0') || (currlen >= maxlen)) 
 			state = DP_S_DONE;

-    switch(state) 
-    {
+		switch(state) {
 			case DP_S_DEFAULT:
 				if (ch == '%') 
 					state = DP_S_FLAGS;
@ -160,8 +132,7 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 				ch = *format++;
 				break;
 			case DP_S_FLAGS:
-      switch (ch) 
-      {
+				switch (ch) {
 					case '-':
 						flags |= DP_F_MINUS;
 						ch = *format++;
@ -188,49 +159,38 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 				}
 				break;
 			case DP_S_MIN:
-      if (isdigit((unsigned char)ch)) 
-      {
+				if (isdigit((unsigned char)ch)) {
 					min = 10*min + char_to_int (ch);
 					ch = *format++;
-      } 
-      else if (ch == '*') 
-      {
+				} else if (ch == '*') {
 					min = va_arg (args, int);
 					ch = *format++;
 					state = DP_S_DOT;
-      } 
-      else 
+				} else 
 					state = DP_S_DOT;
 				break;
 			case DP_S_DOT:
-      if (ch == '.') 
-      {
+				if (ch == '.') {
 					state = DP_S_MAX;
 					ch = *format++;
-      } 
-      else 
+				} else 
 					state = DP_S_MOD;
 				break;
 			case DP_S_MAX:
-      if (isdigit((unsigned char)ch)) 
-      {
+				if (isdigit((unsigned char)ch)) {
 					if (max < 0)
 						max = 0;
 					max = 10*max + char_to_int(ch);
 					ch = *format++;
-      } 
-      else if (ch == '*') 
-      {
+				} else if (ch == '*') {
 					max = va_arg (args, int);
 					ch = *format++;
 					state = DP_S_MOD;
-      } 
-      else 
+				} else 
 					state = DP_S_MOD;
 				break;
 			case DP_S_MOD:
-      switch (ch) 
-      {
+				switch (ch) {
 					case 'h':
 						cflags = DP_C_SHORT;
 						ch = *format++;
@ -257,8 +217,7 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 				state = DP_S_CONV;
 				break;
 			case DP_S_CONV:
-      switch (ch) 
-      {
+				switch (ch) {
 					case 'd':
 					case 'i':
 						if (cflags == DP_C_SHORT) 
@ -347,26 +306,19 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 						fmtint(buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
 						break;
 					case 'n':
-	if (cflags == DP_C_SHORT) 
-	{
+						if (cflags == DP_C_SHORT) {
 							short int *num;
 							num = va_arg(args, short int *);
 							*num = currlen;
-        } 
-	else if (cflags == DP_C_LONG) 
-	{
+						} else if (cflags == DP_C_LONG) {
 							long int *num;
 							num = va_arg(args, long int *);
 							*num = currlen;
-        } 
-	else if (cflags == DP_C_LONG_LONG)
-        {
+						} else if (cflags == DP_C_LONG_LONG) {
 							long long *num;
 							num = va_arg(args, long long *);
 							*num = currlen;
-        }
-	else 
-	{
+						} else {
 							int *num;
 							num = va_arg(args, int *);
 							*num = currlen;
@ -375,12 +327,10 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 					case '%':
 						dopr_outch(buffer, &currlen, maxlen, ch);
 						break;
-      case 'w':
-	/* not supported yet, treat as next char */
+					case 'w': /* not supported yet, treat as next char */
 						ch = *format++;
 						break;
-      default:
-	/* Unknown, skip */
+					default: /* Unknown, skip */
 					break;
 				}
 				ch = *format++;
@ -390,8 +340,7 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 				break;
 			case DP_S_DONE:
 				break;
-    default:
-      /* hmm? */
+			default: /* hmm? */
 				break; /* some picky compilers need this */
 		}
 	}
@ -401,16 +350,15 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 		buffer[maxlen - 1] = '\0';
 }

-static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
+static void
+fmtstr(char *buffer, size_t *currlen, size_t maxlen,
       char *value, int flags, int min, int max)
 {
 	int padlen, strln;     /* amount to pad */
 	int cnt = 0;
  
 	if (value == 0) 
-  {
 		value = "<NULL>";
-  }

 	for (strln = 0; value[strln]; ++strln); /* strlen */
 	padlen = min - strln;
@ -419,19 +367,16 @@ static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
 	if (flags & DP_F_MINUS) 
 		padlen = -padlen; /* Left Justify */

-  while ((padlen > 0) && (cnt < max)) 
-  {
+	while ((padlen > 0) && (cnt < max)) {
 		dopr_outch(buffer, currlen, maxlen, ' ');
 		--padlen;
 		++cnt;
 	}
-  while (*value && (cnt < max)) 
-  {
+	while (*value && (cnt < max)) {
 		dopr_outch(buffer, currlen, maxlen, *value++);
 		++cnt;
 	}
-  while ((padlen < 0) && (cnt < max)) 
-  {
+	while ((padlen < 0) && (cnt < max)) {
 		dopr_outch(buffer, currlen, maxlen, ' ');
 		++padlen;
 		++cnt;
@ -440,12 +385,13 @@ static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,

 /* Have to handle DP_F_NUM (ie 0x and 0 alternates) */

-static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
+static void 
+fmtint(char *buffer, size_t *currlen, size_t maxlen,
       long value, int base, int min, int max, int flags)
 {
-  int signvalue = 0;
 	unsigned long uvalue;
 	char convert[20];
+	int signvalue = 0;
 	int place = 0;
 	int spadlen = 0; /* amount to space pad */
 	int zpadlen = 0; /* amount to zero pad */
@ -456,21 +402,18 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,

 	uvalue = value;

-  if(!(flags & DP_F_UNSIGNED))
-  {
+	if (!(flags & DP_F_UNSIGNED)) {
 		if (value < 0) {
 			signvalue = '-';
 			uvalue = -value;
-    }
-    else
-      if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
+		} else if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
 			signvalue = '+';
-    else
-      if (flags & DP_F_SPACE)
+		else if (flags & DP_F_SPACE)
 			signvalue = ' ';
 	}
  
-  if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
+	if (flags & DP_F_UP) 
+		caps = 1; /* Should characters be upper case? */

 	do {
 		convert[place++] =
@ -478,29 +421,26 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
 			[uvalue % (unsigned)base];
 		uvalue = (uvalue / (unsigned)base );
 	} while (uvalue && (place < 20));
-  if (place == 20) place--;
+	if (place == 20) 
+		place--;
 	convert[place] = 0;

 	zpadlen = max - place;
 	spadlen = min - MAX (max, place) - (signvalue ? 1 : 0);
-  if (zpadlen < 0) zpadlen = 0;
-  if (spadlen < 0) spadlen = 0;
-  if (flags & DP_F_ZERO)
-  {
+	if (zpadlen < 0)
+		zpadlen = 0;
+	if (spadlen < 0)
+		spadlen = 0;
+	if (flags & DP_F_ZERO) {
 		zpadlen = MAX(zpadlen, spadlen);
 		spadlen = 0;
 	}
 	if (flags & DP_F_MINUS) 
 		spadlen = -spadlen; /* Left Justifty */

-#ifdef DEBUG_SNPRINTF
-  dprint (1, (debugfile, "zpad: %d, spad: %d, min: %d, max: %d, place: %d\n",
-      zpadlen, spadlen, min, max, place));
-#endif

 	/* Spaces */
-  while (spadlen > 0) 
-  {
+	while (spadlen > 0) {
 		dopr_outch(buffer, currlen, maxlen, ' ');
 		--spadlen;
 	}
@ -510,10 +450,8 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
 		dopr_outch(buffer, currlen, maxlen, signvalue);

 	/* Zeros */
-  if (zpadlen > 0) 
-  {
-    while (zpadlen > 0)
-    {
+	if (zpadlen > 0) {
+		while (zpadlen > 0) {
 			dopr_outch(buffer, currlen, maxlen, '0');
 			--zpadlen;
 		}
@ -530,22 +468,12 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
 	}
 }

-static long double abs_val (long double value)
-{
-  long double result = value;
-
-  if (value < 0)
-    result = -value;
-
-  return result;
-}
-
-static long double pow10 (int exp)
+static long double 
+pow10(int exp)
 {
 	long double result = 1;

-  while (exp)
-  {
+	while (exp) {
 		result *= 10;
 		exp--;
 	}
@ -553,25 +481,25 @@ static long double pow10 (int exp)
 	return result;
 }

-static long round (long double value)
+static long 
+round(long double value)
 {
-  long intpart;
+	long intpart = value;

-  intpart = value;
-  value = value - intpart;
+	value -= intpart;
 	if (value >= 0.5)
 		intpart++;

 	return intpart;
 }

-static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
-		   long double fvalue, int min, int max, int flags)
+static void 
+fmtfp(char *buffer, size_t *currlen, size_t maxlen, long double fvalue, 
+      int min, int max, int flags)
 {
-  int signvalue = 0;
-  long double ufvalue;
 	char iconvert[20];
 	char fconvert[20];
+	int signvalue = 0;
 	int iplace = 0;
 	int fplace = 0;
 	int padlen = 0; /* amount to pad */
@ -579,6 +507,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	int caps = 0;
 	long intpart;
 	long fracpart;
+	long double ufvalue;
  
 	/* 
 	 * AIX manpage says the default is 0, but Solaris says the default
@ -591,17 +520,11 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,

 	if (fvalue < 0)
 		signvalue = '-';
-  else
-    if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
+	else if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
 		signvalue = '+';
-    else
-      if (flags & DP_F_SPACE)
+	else if (flags & DP_F_SPACE)
 		signvalue = ' ';

-#if 0
-  if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
-#endif
-
 	intpart = ufvalue;

 	/* 
@ -616,23 +539,19 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	 */
 	fracpart = round((pow10 (max)) * (ufvalue - intpart));

-  if (fracpart >= pow10 (max))
-  {
+	if (fracpart >= pow10 (max)) {
 		intpart++;
 		fracpart -= pow10 (max);
 	}

-#ifdef DEBUG_SNPRINTF
-  dprint (1, (debugfile, "fmtfp: %f =? %d.%d\n", fvalue, intpart, fracpart));
-#endif
-
 	/* Convert integer part */
 	do {
 		iconvert[iplace++] =
 		  (caps? "0123456789ABCDEF":"0123456789abcdef")[intpart % 10];
 		intpart = (intpart / 10);
 	} while(intpart && (iplace < 20));
-  if (iplace == 20) iplace--;
+	if (iplace == 20) 
+		iplace--;
 	iconvert[iplace] = 0;

 	/* Convert fractional part */
@ -641,7 +560,8 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 		  (caps? "0123456789ABCDEF":"0123456789abcdef")[fracpart % 10];
 		fracpart = (fracpart / 10);
 	} while(fracpart && (fplace < 20));
-  if (fplace == 20) fplace--;
+	if (fplace == 20) 
+		fplace--;
 	fconvert[fplace] = 0;

 	/* -1 for decimal point, another -1 if we are printing a sign */
@ -654,22 +574,18 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	if (flags & DP_F_MINUS) 
 		padlen = -padlen; /* Left Justifty */

-  if ((flags & DP_F_ZERO) && (padlen > 0)) 
-  {
-    if (signvalue) 
-    {
+	if ((flags & DP_F_ZERO) && (padlen > 0)) {
+		if (signvalue) {
 			dopr_outch(buffer, currlen, maxlen, signvalue);
 			--padlen;
 			signvalue = 0;
 		}
-    while (padlen > 0)
-    {
+		while (padlen > 0) {
 			dopr_outch(buffer, currlen, maxlen, '0');
 			--padlen;
 		}
 	}
-  while (padlen > 0)
-  {
+	while (padlen > 0) {
 		dopr_outch(buffer, currlen, maxlen, ' ');
 		--padlen;
 	}
@ -688,20 +604,19 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	while (fplace > 0) 
 		dopr_outch(buffer, currlen, maxlen, fconvert[--fplace]);

-  while (zpadlen > 0)
-  {
+	while (zpadlen > 0) {
 		dopr_outch(buffer, currlen, maxlen, '0');
 		--zpadlen;
 	}

-  while (padlen < 0) 
-  {
+	while (padlen < 0) {
 		dopr_outch(buffer, currlen, maxlen, ' ');
 		++padlen;
 	}
 }

-static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c)
+static void 
+dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 {
 	if (*currlen < maxlen)
 		buffer[(*currlen)++] = c;
@ -709,44 +624,34 @@ static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c)
 #endif /* !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) */

 #ifndef HAVE_VSNPRINTF
-int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
+int 
+vsnprintf(char *str, size_t count, const char *fmt, va_list args)
 {
 	str[0] = 0;
 	dopr(str, count, fmt, args);
+
 	return(strlen(str));
 }
 #endif /* !HAVE_VSNPRINTF */

 #ifndef HAVE_SNPRINTF
-/* VARARGS3 */
-#ifdef HAVE_STDARGS
-int snprintf (char *str,size_t count,const char *fmt,...)
-#else
-int snprintf (va_alist) va_dcl
-#endif
+int 
+snprintf(char *str,size_t count,const char *fmt,...)
 {
-#ifndef HAVE_STDARGS
-  char *str;
-  size_t count;
-  char *fmt;
-#endif
-  VA_LOCAL_DECL;
+	va_list ap;

-  VA_START (fmt);
-  VA_SHIFT (str, char *);
-  VA_SHIFT (count, size_t );
-  VA_SHIFT (fmt, char *);
+	va_start(ap, fmt);
 	(void) vsnprintf(str, count, fmt, ap);
-  VA_END;
+	va_end(ap);
+
 	return(strlen(str));
 }

 #ifdef TEST_SNPRINTF
-#ifndef LONG_STRING
-#define LONG_STRING 1024
-#endif
-int main (void)
+int 
+main(void)
 {
+#define LONG_STRING 1024
 	char buf1[LONG_STRING];
 	char buf2[LONG_STRING];
 	char *fp_fmt[] = {
@ -763,8 +668,19 @@ int main (void)
 		"%3.2f",
 		NULL
 	};
-  double fp_nums[] = { -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, 
-    0.9996, 1.996, 4.136, 0};
+	double fp_nums[] = { 
+		-1.5, 
+		134.21, 
+		91340.2, 
+		341.1234, 
+		0203.9, 
+		0.96, 
+		0.996, 
+		0.9996, 
+		1.996, 
+		4.136, 
+		0
+	};
 	char *int_fmt[] = {
 		"%-1.5d",
 		"%1.5d",
@ -786,34 +702,34 @@ int main (void)

 	printf("Testing snprintf format codes against system sprintf...\n");

-  for (x = 0; fp_fmt[x] != NULL ; x++)
-    for (y = 0; fp_nums[y] != 0 ; y++)
-    {
+	for (x = 0; fp_fmt[x] != NULL ; x++) {
+		for (y = 0; fp_nums[y] != 0 ; y++) {
 			snprintf(buf1, sizeof (buf1), fp_fmt[x], fp_nums[y]);
 			sprintf (buf2, fp_fmt[x], fp_nums[y]);
-      if (strcmp (buf1, buf2))
-      {
-	printf("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf  = %s\n", 
+			if (strcmp (buf1, buf2)) {
+				printf("snprintf doesn't match Format: %s\n\t"
+                                       "snprintf = %s\n\tsprintf  = %s\n", 
 					fp_fmt[x], buf1, buf2);
 				fail++;
 			}
 			num++;
 		}
-
-  for (x = 0; int_fmt[x] != NULL ; x++)
-    for (y = 0; int_nums[y] != 0 ; y++)
-    {
+	}
+	for (x = 0; int_fmt[x] != NULL ; x++) {
+		for (y = 0; int_nums[y] != 0 ; y++) {
 			snprintf(buf1, sizeof (buf1), int_fmt[x], int_nums[y]);
 			sprintf(buf2, int_fmt[x], int_nums[y]);
-      if (strcmp (buf1, buf2))
-      {
-	printf("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf  = %s\n", 
+			if (strcmp (buf1, buf2)) {
+				printf("snprintf doesn't match Format: %s\n\t"
+				       "snprintf = %s\n\tsprintf  = %s\n", 
 					int_fmt[x], buf1, buf2);
 				fail++;
 			}
 			num++;
 		}
+	}
 	printf("%d tests failed out of %d.\n", fail, num);
+	return(0);
 }
 #endif /* SNPRINTF_TEST */