Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

- Fix for possible unset uid/gid in toproto
 - Fix for default mtree style
 - Update libelf
 - Importing libexecinfo
 - Resynchronize GCC, mpc, gmp, mpfr
 - build.sh: Replace params with show-params.
     This has been done as the make target has been renamed in the same
     way, while a new target named params has been added. This new
     target generates a file containing all the parameters, instead of
     printing it on the console.
 - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
     get getservbyport() out of the inner loop

Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091

usr.bin/sort/init.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.28 2010/12/18 23:09:48 christos Exp $	*/
+/*	$NetBSD: init.c,v 1.29 2013/10/18 20:47:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 
 #include "sort.h"
 
-__RCSID("$NetBSD: init.c,v 1.28 2010/12/18 23:09:48 christos Exp $");
+__RCSID("$NetBSD: init.c,v 1.29 2013/10/18 20:47:06 christos Exp $");
 
 #include <ctype.h>
 #include <string.h>
@@ -233,9 +233,9 @@ optval(int desc, int tcolflag)
 	case 'i': return I;
 	case 'l': return L;
 	case 'n': return N;
-#ifdef __minix
+#if defined(__minix)
 	case 'x': return X;
-#endif
+#endif /* defined(__minix) */
 	case 'r': return R;
 	default:  return 0;
 	}
@@ -290,7 +290,6 @@ fixit(int *argc, char **argv, const char *opts)
 	int i, j, sawplus;
 	char *vpos, *tpos, spec[20];
 	int col, indent;
-	size_t sz;
 
 	sawplus = 0;
 	for (i = 1; i < *argc; i++) {
@@ -361,7 +360,7 @@ fixit(int *argc, char **argv, const char *opts)
 		}
 
 		/* make the new style spec */
-		sz = snprintf(spec, sizeof(spec), "%d.%d%s", col, indent,
+		(void)snprintf(spec, sizeof(spec), "%d.%d%s", col, indent,
 		    tpos);
 
 		if (sawplus) {