 @@ -1,14 +1,14 @@
-/* $NetBSD: t_bitstring.c,v 1.1 2010/07/17 19:26:27 jmmv Exp $ */
+/* $NetBSD: t_bitstring.c,v 1.2 2010/11/03 16:10:20 christos Exp $ */
 /*-
  * Copyright (c) 1993, 2008, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -53,39 +53,38 @@ printbits(FILE *file, bitstr_t *b, int n
 	(void) fprintf(file, "%3d %3d ", jc, js);
 	for (i=0; i < n; i++) {
 		(void) fprintf(file, "%c", (bit_test(b, i) ? '1' : '0'));
+	}
 	(void) fprintf(file, "%c", '\n');
+}
 static void
 calculate_data(FILE *file, const int test_length)
+{
-	int b, i;
+	int i;
 	bitstr_t *bs;
 	bitstr_t bit_decl(bss, 37);  /* Mostly a random number. */
 	assert(test_length >= 4);
 	(void) fprintf(file, "Testing with TEST_LENGTH = %d\n\n", test_length);
 	(void) fprintf(file, "test _bit_byte, _bit_mask, and bitstr_size\n");
 	(void) fprintf(file, "  i   _bit_byte(i)   _bit_mask(i) bitstr_size(i)\n");
 	for (i=0; i < test_length; i++) {
-		(void) fprintf(file, "%3d%15d%15d%15d\n",
+		(void) fprintf(file, "%3d%15u%15u%15zu\n",
 			i, _bit_byte(i), _bit_mask(i), bitstr_size(i));
+	}
 	bs = bit_alloc(test_length);
 	clearbits(bs, test_length);
 	(void) fprintf(file, "\ntest bit_alloc, clearbits, bit_ffc, bit_ffs\n");
 	(void) fprintf(file, "be:   0  -1 ");
 	for (i=0; i < test_length; i++)
 		(void) fprintf(file, "%c", '0');
 	(void) fprintf(file, "\nis: ");
 	printbits(file, bs, test_length);
 	(void) fprintf(file, "\ntest bit_set\n");
 @@ -195,27 +194,27 @@ calculate_data(FILE *file, const int tes
+	}
 	(void) fprintf(file, "\n");
 	(void) fprintf(file, "1 bit should move right 1 position each line\n");
 	for (i=0; i < test_length; i++) {
 		bit_nclear(bs, 0, test_length - 1);
 		bit_nset(bs, i, i);
 		(void) fprintf(file, "%3d ", i); printbits(file, bs, test_length);
+	}
 	(void) free(bs);
+}
-void
+static void
 one_check(const atf_tc_t *tc, const int test_length)
+{
 	FILE *out;
 	char command[1024];
 	ATF_REQUIRE((out = fopen("out", "w")) != NULL);
 	calculate_data(out, test_length);
 	fclose(out);
 	/* XXX The following is a huge hack that was added to simplify the
 	 * conversion of these tests from src/regress/ to src/tests/.  The
 	 * tests in this file should be checking their own results, without
 	 * having to resort to external data files. */

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_extent.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+/* $NetBSD: t_extent.c,v 1.2 2010/11/03 16:10:20 christos Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_extent.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+__RCSID("$NetBSD: t_extent.c,v 1.2 2010/11/03 16:10:20 christos Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/extent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <atf-c.h>
 #include "../h_macros.h"
 @@ -72,27 +72,27 @@ h_alloc_subregion(u_long substart, u_lon
 	ret = extent_alloc_subregion1(ex, substart, subend, size,
 	    alignment, 0, boundary, 0, &result);
 	if (ret != expret)
 		FAIL("%s", strerror(errno));
 	if (expret == 0 && result != expres)
 		FAIL("result should be: %#lx, got: %#lx", expres, result);
 #undef FAIL
+}
 static void
 h_require(const char *name, u_long start,
-	u_long end, u_long flags, const char *exp)
+	u_long end, long flags, const char *exp)
+{
 	char buf[4096];
 	struct extent_region *rp;
 	int n = 0;
 	ATF_REQUIRE_STREQ_MSG(ex->ex_name, name,
 	    "expected: \"%s\", got: \"%s\"", name, ex->ex_name);
 	ATF_REQUIRE_EQ_MSG(ex->ex_start, start,
 	    "expected: %#lx, got: %#lx", start, ex->ex_start);
 	ATF_REQUIRE_EQ_MSG(ex->ex_end, end,
 	    "expected: %#lx, got: %#lx", end, ex->ex_end);
 	ATF_REQUIRE_EQ_MSG(ex->ex_flags, flags,
 	    "expected: %#lx, got: %#lx", flags, ex->ex_flags);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_filedesc.c,v 1.3 2010/08/04 14:28:28 pooka Exp $	*/
+/*	$NetBSD: t_filedesc.c,v 1.4 2010/11/03 16:10:20 christos Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,34 +17,35 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_filedesc.c,v 1.3 2010/08/04 14:28:28 pooka Exp $");
+__RCSID("$NetBSD: t_filedesc.c,v 1.4 2010/11/03 16:10:20 christos Exp $");
 #include <sys/types.h>
 #include <assert.h>
 #include <atf-c.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 #include "../h_macros.h"
 ATF_TC(getfilerace);
 ATF_TC_HEAD(getfilerace, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "race between multithreaded proc. "
 	    "fd_getfile() and fd_close()");
 	/* PR kern/43694 */

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_sig.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+/* $NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $ */
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn and Jaromir Dolecek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,27 +22,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sig.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+__RCSID("$NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $");
 #include <sys/event.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <inttypes.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 @@ -101,28 +101,28 @@ ATF_TC_BODY(sig, tc)
 	(void)sleep(1);
 	timeout.tv_sec = 1;
 	timeout.tv_nsec = 0;
 	for (num = 0; num < NSIGNALS; num += n) {
 		struct timeval then, now, diff;
 		RL(gettimeofday(&then, NULL));
 		RL(n = kevent(kq, NULL, 0, event, 1, &timeout));
 		RL(gettimeofday(&now, NULL));
 		timersub(&now, &then, &diff);
-		(void)printf("sig: kevent returned %d in %ld.%06ld\n",
+		(void)printf("sig: kevent returned %d in %lld.%06ld\n",
-		    n, diff.tv_sec, diff.tv_usec);
+		    n, (long long)diff.tv_sec, (long)diff.tv_usec);
 		if (n == 0)
 			continue;
 		(void)printf("sig: kevent flags: 0x%x, data: %" PRId64 " (# "
 		    "times signal posted)\n", event[0].flags, event[0].data);
+	}
 	(void)waitpid(child, &status, 0);
 	(void)printf("sig: finished successfully\n");
+}
 ATF_TP_ADD_TCS(tp)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_glob_star.c,v 1.5 2010/10/13 11:19:28 pooka Exp $	*/
+/*	$NetBSD: t_glob_star.c,v 1.6 2010/11/03 16:10:21 christos Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,27 +22,27 @@
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
  * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_glob_star.c,v 1.5 2010/10/13 11:19:28 pooka Exp $");
+__RCSID("$NetBSD: t_glob_star.c,v 1.6 2010/11/03 16:10:21 christos Exp $");
 #include <atf-c.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <glob.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 @@ -117,32 +117,32 @@ gl_opendir(const char *dir)
 	for (i = 0; i < __arraycount(d); i++)
 		if (strcmp(buf, d[i].name) == 0) {
 			DPRINTF(("opendir %s %zu\n", buf, i));
 			return &d[i];
+		}
 	errno = ENOENT;
 	return NULL;
+}
 static struct dirent *
 gl_readdir(void *v)
+{
 	static struct dirent dir;
-	struct gl_dir *d = v;
+	struct gl_dir *dd = v;
-	if (d->pos < d->len) {
+	if (dd->pos < dd->len) {
-		const struct gl_file *f = &d->dir[d->pos++];
+		const struct gl_file *f = &dd->dir[dd->pos++];
 		strcpy(dir.d_name, f->name);
 		dir.d_namlen = strlen(f->name);
-		dir.d_ino = d->pos;
+		dir.d_ino = dd->pos;
 		dir.d_type = f->dir ? DT_DIR : DT_REG;
 		DPRINTF(("readdir %s %d\n", dir.d_name, dir.d_type));
 		dir.d_reclen = _DIRENT_RECLEN(&dir, dir.d_namlen);
 		return &dir;
+	}
 	return NULL;
+}
 static int
 gl_stat(const char *name , __gl_stat_t *st)
+{
 	char buf[MAXPATHLEN];
 	trim(buf, sizeof(buf), name);
 @@ -152,29 +152,29 @@ gl_stat(const char *name , __gl_stat_t *
 	DPRINTF(("stat %s %d\n", buf, st->st_mode));
 	return 0;
+}
 static int
 gl_lstat(const char *name , __gl_stat_t *st)
+{
 	return gl_stat(name, st);
+}
 static void
 gl_closedir(void *v)
+{
-	struct gl_dir *d = v;
+	struct gl_dir *dd = v;
-	d->pos = 0;
+	dd->pos = 0;
-	DPRINTF(("closedir %p\n", d));
+	DPRINTF(("closedir %p\n", dd));
+}
 static void
 run(const char *p, int flags, const char **res, size_t len)
+{
 	glob_t gl;
 	size_t i;
 	memset(&gl, 0, sizeof(gl));
 	gl.gl_opendir = gl_opendir;
 	gl.gl_readdir = gl_readdir;
 	gl.gl_closedir = gl_closedir;
 	gl.gl_stat = gl_stat;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_sha2.c,v 1.1 2010/01/24 21:12:17 joerg Exp $	*/
+/*	$NetBSD: t_sha2.c,v 1.2 2010/11/03 16:10:22 christos Exp $	*/
 /*-
  * Copyright (c) 20010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Joerg Sonnenberger.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,27 +22,27 @@
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
  * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_sha2.c,v 1.1 2010/01/24 21:12:17 joerg Exp $");
+__RCSID("$NetBSD: t_sha2.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
 #include <atf-c.h>
 #include <sys/types.h>
 #include <sha2.h>
 #include <string.h>
 ATF_TC(t_sha256);
 ATF_TC(t_sha384);
 ATF_TC(t_sha512);
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, t_sha256);
 @@ -134,109 +134,109 @@ static const struct testvector test512[]
 	{ "abcdefghijklmn", "8334134081070bf7fcc8bf1c242d24bb3182a5119e5fb19d8bbf6b9d0cdb7fed5336e83415fce93094c0e55123cf69e14d7ae41b22289232699824e31125b6d9" },
 	{ "abcdefghijklmno", "db723f341a042d8de1aa813efd5e02fc1745ccbe259486257514804e2ec4bcebb2a46f1e4ad442154943f9e97e1bc47c3ae0eddab7de0c01a9c51f15342a5b19" },
 	{ "abcdefghijklmnop", "d0cadd6834fa0c157b36cca30ee8b0b1435d841aa5b5ac850c11ae80a1440f51743e98fb1f1e7376c70f2f65404f088c28bcb4a511df2e64111f8f7424364b60" },
 	{ "abcdefghijklmnopq", "6196942a8495b721f82bbc385c74c1f10eeadf35db8adc9cf1a05ddeed19351228279644cd5d686ee48a31631ebb64747a2b68b733dd6015e3d27750878fa875" },
 	{ "abcdefghijklmnopqr", "fb3bd1fc157ea6f7a6728986a59b271b766fb723f6b7cf2b4194437435f2c497f33b6a56ae7eb3830fa9e04d5ebb4cb5e3f4d4bd812c498bdf0167e125de3fba" },
 	{ "abcdefghijklmnopqrs", "836f9ecf2aa02f522a94f1370af45a9fd538ac3c70e3b709d614b2f8981881d6b0070fc6387b74ee371fc2549309f82926e78084b401deb61a106c399089bee8" },
 	{ "abcdefghijklmnopqrst", "8cd9c137651425fb32d193d99b281735ec68eb5fd296f16459d1b33eac7badcfce0dca22eadaa5f209fa4ac3bbecd41342bac8b8a5dc3626e7f22cdc96e17cb4" },
 	{ "abcdefghijklmnopqrstu", "7079853a3e36241a8d83639f168ef38e883d7f72851a84ef3ed4d91c6a3896cf542b8b4518c2816fb19d4692a4b9aae65cb857e3642ce0a3936e20363bcbd4ca" },
 	{ "abcdefghijklmnopqrstuv", "a4e8a90b7058fb078e6cdcfd0c6a33c366437eb9084eac657830356804c9f9b53f121496d8e972d8707a4cf02615e6f58ed1a770c28ac79ffd845401fe18a928" },
 	{ "abcdefghijklmnopqrstuvw", "d91b1fd7c7785975493826719f333d090b214ff42351c84d8f8b2538509a28d2d59a36d0ac798d99d3908083b072a4be606ae391def5daa74156350fec71dd24" },
 	{ "abcdefghijklmnopqrstuvwq", "404eb5652173323320cac6bf8d9714aef0747693a8ab4570700c6262268d367f30e31c44fa66860568ff058fe39c9aa8dac76bc78566c691a884cb9052c4aa0a" },
 };
-void
+static void
 digest2string(const uint8_t *digest, char *string, size_t len)
+{
 	while (len--) {
 		if (*digest / 16 < 10)
 			*string++ = '0' + *digest / 16;
 		else
 			*string++ = 'a' + *digest / 16 - 10;
 		if (*digest % 16 < 10)
 			*string++ = '0' + *digest % 16;
 		else
 			*string++ = 'a' + *digest % 16 - 10;
 		++digest;
+	}
 	*string = '\0';
+}
 ATF_TC_HEAD(t_sha256, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Test SHA256 functions for consistent results");
+}
 ATF_TC_BODY(t_sha256, tc)
+{
 	size_t i, j, len;
 	SHA256_CTX ctx;
-	char buf[256];
+	unsigned char buf[256];
-	char digest[8 + SHA256_DIGEST_LENGTH];
+	unsigned char digest[8 + SHA256_DIGEST_LENGTH];
 	char output[SHA256_DIGEST_STRING_LENGTH];
 	for (i = 0; i < sizeof(test256) / sizeof(test256[0]); ++i) {
 		len = strlen(test256[i].vector);
 		for (j = 0; j < 8; ++j) {
 			SHA256_Init(&ctx);
 			memcpy(buf + j, test256[i].vector, len);
 			SHA256_Update(&ctx, buf + j, len);
 			SHA256_Final(digest + j, &ctx);
 			digest2string(digest + j, output, SHA256_DIGEST_LENGTH);
 			ATF_CHECK_STREQ(test256[i].hash, output);
+		}
+	}
+}
 ATF_TC_HEAD(t_sha384, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Test SHA384 functions for consistent results");
+}
 ATF_TC_BODY(t_sha384, tc)
+{
 	size_t i, j, len;
 	SHA384_CTX ctx;
-	char buf[384];
+	unsigned char buf[384];
-	char digest[8 + SHA384_DIGEST_LENGTH];
+	unsigned char digest[8 + SHA384_DIGEST_LENGTH];
 	char output[SHA384_DIGEST_STRING_LENGTH];
 	for (i = 0; i < sizeof(test384) / sizeof(test384[0]); ++i) {
 		len = strlen(test384[i].vector);
 		for (j = 0; j < 8; ++j) {
 			SHA384_Init(&ctx);
 			memcpy(buf + j, test384[i].vector, len);
 			SHA384_Update(&ctx, buf + j, len);
 			SHA384_Final(digest + j, &ctx);
 			digest2string(digest + j, output, SHA384_DIGEST_LENGTH);
 			ATF_CHECK_STREQ(test384[i].hash, output);
+		}
+	}
+}
 ATF_TC_HEAD(t_sha512, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Test SHA512 functions for consistent results");
+}
 ATF_TC_BODY(t_sha512, tc)
+{
 	size_t i, j, len;
 	SHA512_CTX ctx;
-	char buf[512];
+	unsigned char buf[512];
-	char digest[8 + SHA512_DIGEST_LENGTH];
+	unsigned char digest[8 + SHA512_DIGEST_LENGTH];
 	char output[SHA512_DIGEST_STRING_LENGTH];
 	for (i = 0; i < sizeof(test512) / sizeof(test512[0]); ++i) {
 		len = strlen(test512[i].vector);
 		for (j = 0; j < 8; ++j) {
 			SHA512_Init(&ctx);
 			memcpy(buf + j, test512[i].vector, len);
 			SHA512_Update(&ctx, buf + j, len);
 			SHA512_Final(digest + j, &ctx);
 			digest2string(digest + j, output, SHA512_DIGEST_LENGTH);
 			ATF_CHECK_STREQ(test512[i].hash, output);
+		}
+	}

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_fmemopen.c,v 1.1 2010/09/24 09:21:53 tnozaki Exp $ */
+/* $NetBSD: t_fmemopen.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
 /*-
  * Copyright (c)2010 Takehiko NOZAKI,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -58,27 +58,27 @@
 const char *mode_rwa[] = {
     "r", "rb", "r+", "rb+", "r+b",
     "w", "wb", "w+", "wb+", "w+b",
     "a", "ab", "a+", "ab+", "a+b",
     NULL
 };
 const char *mode_r[] = { "r", "rb", "r+", "rb+", "r+b", NULL };
 const char *mode_w[] = { "w", "wb", "w+", "wb+", "w+b", NULL };
 const char *mode_a[] = { "a", "ab", "a+", "ab+", "a+b", NULL };
 struct testcase {
 	const char *s;
-	size_t n;
+	off_t n;
 } testcases[] = {
 #define TESTSTR(s)	{ s, sizeof(s)-1 }
 	TESTSTR("\0he quick brown fox jumps over the lazy dog"),
 	TESTSTR("T\0e quick brown fox jumps over the lazy dog"),
 	TESTSTR("Th\0 quick brown fox jumps over the lazy dog"),
 	TESTSTR("The\0quick brown fox jumps over the lazy dog"),
 	TESTSTR("The \0uick brown fox jumps over the lazy dog"),
 	TESTSTR("The q\0ick brown fox jumps over the lazy dog"),
 	TESTSTR("The qu\0ck brown fox jumps over the lazy dog"),
 	TESTSTR("The qui\0k brown fox jumps over the lazy dog"),
 	TESTSTR("The quic\0 brown fox jumps over the lazy dog"),
 	TESTSTR("The quick\0brown fox jumps over the lazy dog"),
 	TESTSTR("The quick \0rown fox jumps over the lazy dog"),
 @@ -741,40 +741,40 @@ const char *mode_rw1[] = {
  * at the current position or at the end of the buffer, depending on the size
  * of the contents.
  */
 ATF_TC(test15);
 ATF_TC_HEAD(test15, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "test15");
+}
 ATF_TC_BODY(test15, tc)
+{
 	struct testcase *t;
 	const char **p;
-	char buf0[BUFSIZ], buf1[BUFSIZ];
+	char buf0[BUFSIZ];
 	FILE *fp;
-	size_t i;
+	int i;
 	for (t = &testcases[0]; t->s != NULL; ++t) {
 		for (p = &mode_rw1[0]; *p != NULL; ++p) {
 			memcpy(&buf0[0], t->s, t->n);
 			fp = fmemopen(&buf0[0], t->n, *p);
 			ATF_CHECK(fp != NULL);
 /*
  * test fmemopen_read + fgetc(3)
  */
-			for (i = (size_t)0; i < t->n; ++i) {
+			for (i = 0; i < t->n; ++i) {
 				ATF_CHECK(ftello(fp) == (off_t)i);
 				ATF_CHECK(fgetc(fp) == buf0[i]);
 				ATF_CHECK(feof(fp) == 0);
 				ATF_CHECK(ftello(fp) == (off_t)i + 1);
+			}
 			ATF_CHECK(fgetc(fp) == EOF);
 			ATF_CHECK(feof(fp) != 0);
 			ATF_CHECK(ftello(fp) == (off_t)t->n);
 			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
 @@ -791,47 +791,48 @@ ATF_TC_BODY(test16, tc)
 	FILE *fp;
 	for (t = &testcases[0]; t->s != NULL; ++t) {
 		for (p = &mode_rw1[0]; *p != NULL; ++p) {
 			memcpy(&buf0[0], t->s, t->n);
 			buf1[t->n] = 0x1;
 			fp = fmemopen(&buf0[0], t->n, *p);
 			ATF_CHECK(fp != NULL);
 /*
  * test fmemopen_read + fread(4)
  */
 			ATF_CHECK(ftello(fp) == (off_t)0);
-			ATF_CHECK(fread(&buf1[0], 1, sizeof(buf1), fp) == t->n);
+			ATF_CHECK(fread(&buf1[0], 1, sizeof(buf1), fp) == (size_t)t->n);
 			ATF_CHECK(feof(fp) != 0);
 			ATF_CHECK(memcmp(&buf0[0], &buf1[0], t->n) == 0);
 			ATF_CHECK((unsigned char)buf1[t->n] == 0x1);
 			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
 const char *mode_a1[] = { "a+", "ab+", NULL };
 ATF_TC(test17);
 ATF_TC_HEAD(test17, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "test17");
+}
 ATF_TC_BODY(test17, tc)
+{
 	struct testcase *t;
-	size_t len, i;
+	size_t len;
 	int i;
 	const char **p;
 	char buf[BUFSIZ];
 	FILE *fp;
 	for (t = &testcases[0]; t->s != NULL; ++t) {
 		len = strnlen(t->s, t->n);
 		for (p = &mode_a1[0]; *p != NULL; ++p) {
 			memcpy(&buf[0], t->s, t->n);
 			fp = fmemopen(&buf[0], t->n, *p);
 			ATF_CHECK(fp != NULL);
 /*
  * test fmemopen_read + fgetc(3)
 @@ -839,52 +840,52 @@ ATF_TC_BODY(test17, tc)
 #if defined(__GLIBC__)
 			if (i < t->n) {
 #endif
 			for (i = len; i < t->n; ++i) {
 				ATF_CHECK(ftello(fp) == (off_t)i);
 				ATF_CHECK(fgetc(fp) == buf[i]);
 				ATF_CHECK(feof(fp) == 0);
 				ATF_CHECK(ftello(fp) == (off_t)i + 1);
+			}
 			ATF_CHECK(fgetc(fp) == EOF);
 			ATF_CHECK(feof(fp) != 0);
 			ATF_CHECK(ftello(fp) == (off_t)t->n);
 			rewind(fp);
-			for (i = (size_t)0; i < t->n; ++i) {
+			for (i = 0; i < t->n; ++i) {
 				ATF_CHECK(ftello(fp) == (off_t)i);
 				ATF_CHECK(fgetc(fp) == buf[i]);
 				ATF_CHECK(feof(fp) == 0);
 				ATF_CHECK(ftello(fp) == (off_t)i + 1);
+			}
 			ATF_CHECK(fgetc(fp) == EOF);
 			ATF_CHECK(feof(fp) != 0);
 			ATF_CHECK(ftello(fp) == (off_t)t->n);
 #if defined(__GLIBC__)
+			}
 #endif
 			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
 ATF_TC(test18);
 ATF_TC_HEAD(test18, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "test18");
+}
 ATF_TC_BODY(test18, tc)
+{
 	struct testcase *t;
-	size_t len, i;
+	size_t len;
 	const char **p;
 	char buf0[BUFSIZ], buf1[BUFSIZ];
 	FILE *fp;
 	for (t = &testcases[0]; t->s != NULL; ++t) {
 		len = strnlen(t->s, t->n);
 		for (p = &mode_a1[0]; *p != NULL; ++p) {
 			memcpy(&buf0[0], t->s, t->n);
 			buf1[t->n - len] = 0x1;
 			fp = fmemopen(&buf0[0], t->n, *p);
 			ATF_CHECK(fp != NULL);
 /*
 @@ -893,27 +894,27 @@ ATF_TC_BODY(test18, tc)
 #if defined(__GLIBC__)
 			if (i < t->n) {
 #endif
 			ATF_CHECK(ftello(fp) == (off_t)len);
 			ATF_CHECK(fread(&buf1[0], 1, sizeof(buf1), fp)
 			    == t->n - len);
 			ATF_CHECK(feof(fp) != 0);
 			ATF_CHECK(!memcmp(&buf0[len], &buf1[0], t->n - len));
 			ATF_CHECK((unsigned char)buf1[t->n - len] == 0x1);
 			rewind(fp);
 			buf1[t->n] = 0x1;
 			ATF_CHECK(ftello(fp) == (off_t)0);
 			ATF_CHECK(fread(&buf1[0], 1, sizeof(buf1), fp)
-			    == t->n);
+			    == (size_t)t->n);
 			ATF_CHECK(feof(fp) != 0);
 			ATF_CHECK(!memcmp(&buf0[0], &buf1[0], t->n));
 			ATF_CHECK((unsigned char)buf1[t->n] == 0x1);
 #if defined(__GLIBC__)
+			}
 #endif
 			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
 /*
  * test19 - test22:
 @@ -926,44 +927,45 @@ const char *mode_rw2[] = {
     "r+", "rb+", "r+b",
     "w", "wb", "w+", "wb+", "w+b",
     NULL
 };
 ATF_TC(test19);
 ATF_TC_HEAD(test19, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "test19");
+}
 ATF_TC_BODY(test19, tc)
+{
 	struct testcase *t;
-	size_t len, i;
+	size_t len;
 	int i;
 	const char **p;
 	char buf[BUFSIZ];
 	FILE *fp;
 	for (t = &testcases[0]; t->s != NULL; ++t) {
 		len = strnlen(t->s, t->n);
 		for (p = &mode_rw2[0]; *p != NULL; ++p) {
 			memcpy(&buf[0], t->s, t->n);
 			buf[t->n] = 0x1;
 			fp = fmemopen(&buf[0], t->n + 1, *p);
 			ATF_CHECK(fp != NULL);
 			setbuf(fp, NULL);
 /*
  * test fmemopen_write + fputc(3)
  */
-			for (i = (size_t)0; i < t->n; ++i) {
+			for (i = 0; i < t->n; ++i) {
 				ATF_CHECK(ftello(fp) == (off_t)i);
 				ATF_CHECK(fputc(t->s[i], fp) == t->s[i]);
 				ATF_CHECK(buf[i] == t->s[i]);
 				ATF_CHECK(ftello(fp) == (off_t)i + 1);
 				ATF_CHECK(buf[i] == t->s[i]);
 #if !defined(__GLIBC__)
 				ATF_CHECK(buf[i + 1] == '\0');
 #endif
+			}
 /* don't accept non nul character at end of buffer */
 			ATF_CHECK(fputc(0x1, fp) == EOF);
 			ATF_CHECK(ftello(fp) == (off_t)t->n);
 @@ -985,41 +987,41 @@ ATF_TC_BODY(test19, tc)
 			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
 ATF_TC(test20);
 ATF_TC_HEAD(test20, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "test20");
+}
 ATF_TC_BODY(test20, tc)
+{
 	struct testcase *t;
-	size_t len, i;
+	size_t len;
 	const char **p;
 	char buf[BUFSIZ];
 	FILE *fp;
 	for (t = &testcases[0]; t->s != NULL; ++t) {
 		len = strnlen(t->s, t->n);
 		for (p = &mode_rw2[0]; *p != NULL; ++p) {
 			memcpy(&buf[0], t->s, t->n);
 			buf[t->n] = 0x1;
 			fp = fmemopen(&buf[0], t->n + 1, *p);
 			ATF_CHECK(fp != NULL);
 			setbuf(fp, NULL);
-			ATF_CHECK(fwrite(t->s, 1, t->n, fp) == t->n);
+			ATF_CHECK(fwrite(t->s, 1, t->n, fp) == (size_t)t->n);
 /*
  * test fmemopen_write + fwrite(3)
  */
 #if !defined(__GLIBC__)
 			ATF_CHECK(buf[t->n] == '\0');
 /* don't accept non nul character at end of buffer */
 			ATF_CHECK(fwrite("\x1", 1, 1, fp) == 0);
 			ATF_CHECK(ftello(fp) == (off_t)t->n);
 			ATF_CHECK(feof(fp) == 0);
 #endif
 /* accept nul character at end of buffer */
 @@ -1038,27 +1040,27 @@ ATF_TC_BODY(test20, tc)
 			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
 ATF_TC(test21);
 ATF_TC_HEAD(test21, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "test21");
+}
 ATF_TC_BODY(test21, tc)
+{
 	struct testcase *t;
-	size_t len, i;
+	int len, i;
 	const char **p;
 	char buf[BUFSIZ];
 	FILE *fp;
 	for (t = &testcases[0]; t->s != NULL; ++t) {
 		len = strnlen(t->s, t->n);
 		for (p = &mode_a[0]; *p != NULL; ++p) {
 			memcpy(&buf[0], t->s, t->n);
 			fp = fmemopen(&buf[0], t->n, *p);
 			ATF_CHECK(fp != NULL);
 			setbuf(fp, NULL);
 /*
  * test fmemopen_write + fputc(3)
 @@ -1094,27 +1096,27 @@ ATF_TC_BODY(test21, tc)
 			ATF_CHECK(fclose(fp) == 0);
+		}
+	}
+}
 ATF_TC(test22);
 ATF_TC_HEAD(test22, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "test22");
+}
 ATF_TC_BODY(test22, tc)
+{
 	struct testcase *t0, *t1;
-	size_t len0, len1, i, nleft;
+	size_t len0, len1, nleft;
 	const char **p;
 	char buf[BUFSIZ];
 	FILE *fp;
 	for (t0 = &testcases[0]; t0->s != NULL; ++t0) {
 		len0 = strnlen(t0->s, t0->n);
 		for (t1 = &testcases[0]; t1->s != NULL; ++t1) {
 			len1 = strnlen(t1->s, t1->n);
 			for (p = &mode_a[0]; *p != NULL; ++p) {
 				memcpy(&buf[0], t0->s, t0->n);
 				fp = fmemopen(&buf[0], t0->n, *p);
 				ATF_CHECK(fp != NULL);

 @@ -1,14 +1,14 @@
-/* $NetBSD: h_resolv.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+/* $NetBSD: h_resolv.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
 /*-
  * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -22,27 +22,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: h_resolv.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+__RCSID("$NetBSD: h_resolv.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
 #include <pthread.h>
 #include <stdio.h>
 #include <netdb.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <err.h>
 #include <string.h>
 #include <stringlist.h>
 #define NTHREADS    10
 #define NHOSTS        100
 #define WS        " \t\n\r"
 @@ -183,26 +183,26 @@ main(int argc, char *argv[])
+	}
 	for (done = 0; !done;) {
 		done = 1;
 		for (i = 0; i < nthreads; i++) {
 			if (nleft[i] != 0) {
 				done = 0;
 				break;
+			}
+		}
 		sleep(1);
+	}
 	c = 0;
-	for (i = 0; i < hosts->sl_cur; i++) {
+	for (i = 0; i < (int)hosts->sl_cur; i++) {
 		if (ask[i] != got[i] && got[i] != 0) {
 			warnx("Error: host %s ask %d got %d\n",
 				hosts->sl_str[i], ask[i], got[i]);
 			c++;
+		}
+	}
 	free(nleft);
 	free(ask);
 	free(got);
 	sl_free(hosts, 1);
 	return c;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_barrier.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+/* $NetBSD: t_barrier.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,56 +19,56 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_barrier.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+__RCSID("$NetBSD: t_barrier.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
 #include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <atf-c.h>
 #include "h_common.h"
 #define COUNT 5
 pthread_barrier_t barrier;
 pthread_mutex_t mutex;
 int serial_count;
 int after_barrier_count;
 static void *
 threadfunc(void *arg)
+{
 	int which = (int)(long)arg;
-	int ret;
+	int rv;
 	printf("thread %d entering barrier\n", which);
-	ret = pthread_barrier_wait(&barrier);
+	rv = pthread_barrier_wait(&barrier);
-	printf("thread %d leaving barrier -> %d\n", which, ret);
+	printf("thread %d leaving barrier -> %d\n", which, rv);
 	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
 	after_barrier_count++;
-	if (ret == PTHREAD_BARRIER_SERIAL_THREAD)
+	if (rv == PTHREAD_BARRIER_SERIAL_THREAD)
 		serial_count++;
 	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
 	return NULL;
+}
 ATF_TC(barrier);
 ATF_TC_HEAD(barrier, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks barriers");
+}
 ATF_TC_BODY(barrier, tc)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_cond.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+/* $NetBSD: t_cond.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,57 +19,57 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_cond.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+__RCSID("$NetBSD: t_cond.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
 #include <sys/time.h>
 #include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <atf-c.h>
 #include "h_common.h"
 static pthread_mutex_t mutex;
 static pthread_cond_t cond;
 static pthread_mutex_t static_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t static_cond = PTHREAD_COND_INITIALIZER;
 static int count, share, toggle, total;
 static void *
 signal_delay_wait_threadfunc(void *arg)
+{
-	int *share = (int *) arg;
+	int *shared = (int *) arg;
 	printf("2: Second thread.\n");
 	printf("2: Locking mutex\n");
 	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
 	printf("2: Got mutex.\n");
-	printf("Shared value: %d. Changing to 0.\n", *share);
+	printf("Shared value: %d. Changing to 0.\n", *shared);
-	*share = 0;
+	*shared = 0;
 	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
 	PTHREAD_REQUIRE(pthread_cond_signal(&cond));
 	return NULL;
+}
 ATF_TC(signal_delay_wait);
 ATF_TC_HEAD(signal_delay_wait, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks condition variables");
+}
 ATF_TC_BODY(signal_delay_wait, tc)
 @@ -102,35 +102,35 @@ ATF_TC_BODY(signal_delay_wait, tc)
 	printf("1: After the loop.\n");
 	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
 	printf("1: After releasing the mutex.\n");
 	PTHREAD_REQUIRE(pthread_join(new, &joinval));
 	printf("1: Thread joined.\n");
+}
 static void *
 signal_before_unlock_threadfunc(void *arg)
+{
-	int *share = (int *) arg;
+	int *shared = (int *) arg;
 	printf("2: Second thread.\n");
 	printf("2: Locking mutex\n");
 	PTHREAD_REQUIRE(pthread_mutex_lock(&mutex));
 	printf("2: Got mutex.\n");
-	printf("Shared value: %d. Changing to 0.\n", *share);
+	printf("Shared value: %d. Changing to 0.\n", *shared);
-	*share = 0;
+	*shared = 0;
 	/* Signal first, then unlock, for a different test than #1. */
 	PTHREAD_REQUIRE(pthread_cond_signal(&cond));
 	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
 	return NULL;
+}
 ATF_TC(signal_before_unlock);
 ATF_TC_HEAD(signal_before_unlock, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 		"Checks condition variables: signal before unlocking mutex");
 @@ -165,35 +165,35 @@ ATF_TC_BODY(signal_before_unlock, tc)
 	printf("1: After the loop.\n");
 	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
 	printf("1: After releasing the mutex.\n");
 	PTHREAD_REQUIRE(pthread_join(new, &joinval));
 	printf("1: Thread joined.\n");
+}
 static void *
 signal_before_unlock_static_init_threadfunc(void *arg)
+{
-	int *share = (int *) arg;
+	int *shared = (int *) arg;
 	printf("2: Second thread.\n");
 	printf("2: Locking mutex\n");
 	PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex));
 	printf("2: Got mutex.\n");
-	printf("Shared value: %d. Changing to 0.\n", *share);
+	printf("Shared value: %d. Changing to 0.\n", *shared);
-	*share = 0;
+	*shared = 0;
 	/* Signal first, then unlock, for a different test than #1. */
 	PTHREAD_REQUIRE(pthread_cond_signal(&static_cond));
 	PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex));
 	return NULL;
+}
 ATF_TC(signal_before_unlock_static_init);
 ATF_TC_HEAD(signal_before_unlock_static_init, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 		"Checks condition variables: signal before unlocking "

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_preempt.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+/* $NetBSD: t_preempt.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_preempt.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+__RCSID("$NetBSD: t_preempt.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <atf-c.h>
 #include "h_common.h"
 @@ -65,27 +65,28 @@ threadfunc(void *arg)
 	sleep(1);
 	return NULL;
+}
 ATF_TC(preempt1);
 ATF_TC_HEAD(preempt1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 		"Checks kernel preemption during a large uiomove");
+}
 ATF_TC_BODY(preempt1, tc)
+{
-	int ret, i;
+	int i;
 	ssize_t rv;
 	pthread_t new;
 	void *joinval;
 	char *mem;
 	int fd;
 	mem = malloc(HUGE_BUFFER);
 	ATF_REQUIRE_MSG(mem != NULL, "%s", strerror(errno));
 	fd = open("/dev/urandom", O_RDONLY, 0);
 	ATF_REQUIRE_MSG(fd != -1, "%s", strerror(errno));
 	printf("1: preempt test\n");
 @@ -100,28 +101,28 @@ ATF_TC_BODY(preempt1, tc)
 	for (i = 0; i < NTHREADS; i++) {
 		PTHREAD_REQUIRE(pthread_create(&new, NULL, threadfunc, NULL));
+	}
 	while (started < NTHREADS) {
 		PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex));
+	}
 	printf("1: Thread has started.\n");
 	PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex));
 	printf("1: After releasing the mutex.\n");
-	ret = read(fd, mem, HUGE_BUFFER);
+	rv = read(fd, mem, HUGE_BUFFER);
 	close(fd);
-	ATF_REQUIRE_EQ(ret, HUGE_BUFFER);
+	ATF_REQUIRE_EQ(rv, HUGE_BUFFER);
 	PTHREAD_REQUIRE(pthread_join(new, &joinval));
 	printf("1: Thread joined.\n");
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, preempt1);
 	return atf_no_error();
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_sigmask.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+/* $NetBSD: t_sigmask.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
 /*
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008, 2010\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sigmask.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+__RCSID("$NetBSD: t_sigmask.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
 /*
  * Regression test for pthread_sigmask when SA upcalls aren't started yet.
+ *
  * Written by Christian Limpach <cl@NetBSD.org>, December 2003.
  * Public domain.
  */
 #include <errno.h>
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
 @@ -169,39 +169,39 @@ respected_while_running_threadroutine(vo
 	return NULL;
+}
 ATF_TC(respected_while_running);
 ATF_TC_HEAD(respected_while_running, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks that signal masks are respected "
 	    "while threads are running");
+}
 ATF_TC_BODY(respected_while_running, tc)
+{
 	struct sigaction act;
 	pthread_t thread;
-	int ret;
+	int rv;
 	act.sa_sigaction = respected_while_running_handler1;
 	sigemptyset(&act.sa_mask);
 	sigaddset(&act.sa_mask, SIGUSR2);
 	act.sa_flags = SA_SIGINFO;
 	ATF_REQUIRE_EQ(sigaction(SIGUSR1, &act, NULL), 0);
 	act.sa_sigaction = respected_while_running_handler2;
 	sigemptyset(&act.sa_mask);
 	act.sa_flags = SA_SIGINFO;
-	ret = sigaction(SIGUSR2, &act, NULL);
+	rv = sigaction(SIGUSR2, &act, NULL);
 	PTHREAD_REQUIRE(pthread_create(&thread, NULL,
 	    respected_while_running_threadroutine, NULL));
 	PTHREAD_REQUIRE(pthread_join(thread, NULL));
+}
 static void
 incorrect_mask_bug_handler(int sig)
+{
 	count++;
+}
 static void *

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_status.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $ */
+/* $NetBSD: t_status.c,v 1.2 2010/11/03 16:10:22 christos Exp $ */
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,51 +19,51 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2010\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_status.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
+__RCSID("$NetBSD: t_status.c,v 1.2 2010/11/03 16:10:22 christos Exp $");
 #include <sys/resource.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <atf-c.h>
 #define NUM 100
 static void *
 threadfunc(void *arg)
+{
 	sleep(1000);
 	return 0;
+}
-int
+static int
 child(const int seed)
+{
 	pthread_t thr[NUM];
 	int i, j, res, errors;
 	char nam[20];
 	struct rlimit sl;
 	srandom(seed);
 	getrlimit(RLIMIT_STACK, &sl);
 	errors = 0;
 	for (i = 0; i < NUM; i++) {
 		res = pthread_create(&thr[i], 0, threadfunc, 0);
 @@ -76,27 +76,27 @@ child(const int seed)
 				    strerror(res));
 				errors++;
+			}
+		}
 		if (errors)
 			break;
 		malloc((random() & 7) * sl.rlim_cur);
+	}
 	if (errors)
 		printf("%d errors; seed was %d\n", errors, seed);
 	return errors > 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}
-void
+static void
 do_test(const int seed)
+{
 	pid_t pid = fork();
 	ATF_REQUIRE(pid != -1);
 	if (pid == 0) {
 		exit(child(seed));
 	} else {
 		int status;
 		ATF_CHECK_EQ(pid, waitpid(pid, &status, 0));
 		if (!(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS))
 			atf_tc_fail_nonfatal("Check with seed %d failed", seed);
+	}
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_sem.c,v 1.4 2010/07/21 17:23:08 jmmv Exp $ */
+/* $NetBSD: t_sem.c,v 1.5 2010/11/03 16:10:22 christos Exp $ */
 /*
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -76,27 +76,27 @@
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
  * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  ****************************************************************************/
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008, 2010\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sem.c,v 1.4 2010/07/21 17:23:08 jmmv Exp $");
+__RCSID("$NetBSD: t_sem.c,v 1.5 2010/11/03 16:10:22 christos Exp $");
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <semaphore.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <atf-c.h>
 #include <atf-c/config.h>
 @@ -109,55 +109,55 @@ __RCSID("$NetBSD: t_sem.c,v 1.4 2010/07/
 #define SEM_REQUIRE(x) \
 	ATF_REQUIRE_EQ_MSG(x, 0, "%s", strerror(errno))
 static sem_t sem;
 ATF_TC(named);
 ATF_TC_HEAD(named, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks named semaphores");
+}
 ATF_TC_BODY(named, tc)
+{
-	sem_t *sem;
+	sem_t *semp;
 	ATF_REQUIRE_MSG(-1 != sysconf(_SC_SEMAPHORES), "%s", strerror(errno));
 	printf("Test begin\n");
 	(void) sem_unlink("/foo");
-	sem = sem_open("/foo", O_CREAT | O_EXCL, 0644, 0);
+	semp = sem_open("/foo", O_CREAT | O_EXCL, 0644, 0);
-	ATF_REQUIRE_MSG(sem != SEM_FAILED, "%s", strerror(errno));
+	ATF_REQUIRE_MSG(semp != SEM_FAILED, "%s", strerror(errno));
-	SEM_REQUIRE(sem_close(sem));
+	SEM_REQUIRE(sem_close(semp));
 	SEM_REQUIRE(sem_unlink("/foo"));
 	printf("Test end\n");
+}
 ATF_TC(unnamed);
 ATF_TC_HEAD(unnamed, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Checks unnamed semaphores");
+}
 static void *
 entry(void * a_arg)
+{
 	pthread_t self = pthread_self();
-	sem_t * sem = (sem_t *) a_arg;
+	sem_t *semp = (sem_t *) a_arg;
 	printf("Thread %p waiting for semaphore...\n", self);
-	sem_wait(sem);
+	sem_wait(semp);
 	printf("Thread %p got semaphore\n", self);
 	return NULL;
+}
 ATF_TC_BODY(unnamed, tc)
+{
 	sem_t sem_a, sem_b;
 	pthread_t threads[NTHREADS];
 	unsigned i, j;
 	int val;
 	ATF_REQUIRE_MSG(-1 != sysconf(_SC_SEMAPHORES), "%s", strerror(errno));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_builtin.c,v 1.1 2010/08/27 09:56:40 pooka Exp $	*/
+/*	$NetBSD: t_builtin.c,v 1.2 2010/11/03 16:10:23 christos Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -34,26 +34,28 @@
 #include <fcntl.h>
 #include <stdbool.h>
 #include <miscfs/kernfs/kernfs.h>
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 #include "../h_macros.h"
 #define MYMP "/mnt"
 #define HZFILE MYMP "/hz"
 static char kernfs[] = "kernfs";
 static bool
 check_kernfs(void)
+{
 	char buf[16];
 	bool rv = true;
 	int fd;
 	fd = rump_sys_open(HZFILE, O_RDONLY);
 	if (fd == -1)
 		return false;
 	if (rump_sys_read(fd, buf, sizeof(buf)) < 1)
 		rv = false;
 	RL(rump_sys_close(fd));
 @@ -67,126 +69,126 @@ ATF_TC_HEAD(disable, tc)
 	atf_tc_set_md_var(tc, "descr", "Tests that builtin modules can "
 	    "be disabled");
+}
 ATF_TC_BODY(disable, tc)
+{
 	rump_init();
 	RL(rump_sys_mkdir(MYMP, 0777));
 	RL(rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0));
 	ATF_REQUIRE(check_kernfs());
 	RL(rump_sys_unmount(MYMP, 0));
-	RL(rump_sys_modctl(MODCTL_UNLOAD, "kernfs"));
+	RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
+}
 ATF_TC(noauto);
 ATF_TC_HEAD(noauto, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Tests that disabled builtin modules "
 	    "will not autoload");
+}
 ATF_TC_BODY(noauto, tc)
+{
 	rump_init();
 	RL(rump_sys_mkdir(MYMP, 0777));
-	RL(rump_sys_modctl(MODCTL_UNLOAD, "kernfs"));
+	RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
 	ATF_REQUIRE_ERRNO(ENODEV,
 	    rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0) == -1);
+}
 ATF_TC(forcereload);
 ATF_TC_HEAD(forcereload, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Tests that disabled builtin modules "
 	    "can be force-reloaded");
+}
 ATF_TC_BODY(forcereload, tc)
+{
 	struct modctl_load mod;
 	rump_init();
 	RL(rump_sys_mkdir(MYMP, 0777));
-	RL(rump_sys_modctl(MODCTL_UNLOAD, "kernfs"));
+	RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
 	ATF_REQUIRE_ERRNO(ENODEV,
 	    rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0) == -1);
 	memset(&mod, 0, sizeof(mod));
-	mod.ml_filename = "kernfs";
+	mod.ml_filename = kernfs;
 	mod.ml_flags = MODCTL_LOAD_FORCE;
 	RL(rump_sys_modctl(MODCTL_LOAD, &mod));
 	RL(rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0));
 	ATF_REQUIRE(check_kernfs());
 	RL(rump_sys_unmount(MYMP, 0));
+}
 ATF_TC(disabledstat);
 ATF_TC_HEAD(disabledstat, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Tests that disabled builtin modules "
 	    "show up in modstat with refcount -1");
+}
 ATF_TC_BODY(disabledstat, tc)
+{
 	struct modstat ms[128];
 	struct iovec iov;
-	int i;
+	size_t i;
 	bool found = false;
 	rump_init();
 	RL(rump_sys_mkdir(MYMP, 0777));
-	RL(rump_sys_modctl(MODCTL_UNLOAD, "kernfs"));
+	RL(rump_sys_modctl(MODCTL_UNLOAD, kernfs));
 	iov.iov_base = ms;
 	iov.iov_len = sizeof(ms);
 	RL(rump_sys_modctl(MODCTL_STAT, &iov));
 	for (i = 0; i < __arraycount(ms); i++) {
-		if (strcmp(ms[i].ms_name, "kernfs") == 0) {
+		if (strcmp(ms[i].ms_name, kernfs) == 0) {
-			ATF_REQUIRE_EQ(ms[i].ms_refcnt, -1);
+			ATF_REQUIRE_EQ(ms[i].ms_refcnt, (u_int)-1);
 			found = 1;
 			break;
+		}
+	}
 	ATF_REQUIRE(found);
+}
 ATF_TC(busydisable);
 ATF_TC_HEAD(busydisable, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Tests that busy builtin modules "
 	    "cannot be disabled");
+}
 ATF_TC_BODY(busydisable, tc)
+{
 	rump_init();
 	RL(rump_sys_mkdir(MYMP, 0777));
 	RL(rump_sys_mount(MOUNT_KERNFS, MYMP, 0, NULL, 0));
 	ATF_REQUIRE(check_kernfs());
 	ATF_REQUIRE_ERRNO(EBUSY,
-	    rump_sys_modctl(MODCTL_UNLOAD, "kernfs") == -1);
+	    rump_sys_modctl(MODCTL_UNLOAD, kernfs) == -1);
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, disable);
 	ATF_TP_ADD_TC(tp, noauto);
 	ATF_TP_ADD_TC(tp, forcereload);
 	ATF_TP_ADD_TC(tp, disabledstat);
 	ATF_TP_ADD_TC(tp, busydisable);
 	return atf_no_error();
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_modctl.c,v 1.4 2010/08/21 13:21:48 pgoyette Exp $	*/
+/*	$NetBSD: t_modctl.c,v 1.5 2010/11/03 16:10:23 christos Exp $	*/
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,27 +17,27 @@
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
  * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: t_modctl.c,v 1.4 2010/08/21 13:21:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: t_modctl.c,v 1.5 2010/11/03 16:10:23 christos Exp $");
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <prop/proplib.h>
 @@ -192,27 +192,28 @@ k_helper_is_present(enum presence_check
 		found = k_helper_is_present_stat();
 		ATF_CHECK(k_helper_is_present_sysctl() == found);
 		break;
 	case stat_check:
 		found = k_helper_is_present_stat();
 		break;
 	case sysctl_check:
 		found = k_helper_is_present_sysctl();
 		break;
 	default:
-		assert(false);
+		found = false;
 		assert(found);
+	}
 	return found;
+}
 /*
  * Loads the specified module from a file.  If fatal is set and an error
  * occurs when loading the module, an error message is printed and the
  * test case is aborted.
  */
 static
 int
 load(prop_dictionary_t props, bool fatal, const char *fmt, ...)
 @@ -273,27 +274,27 @@ unload(const char *name, bool fatal)
 		fprintf(stderr, "modctl(MODCTL_UNLOAD, %s) failed: %s\n",
 		    name, strerror(err));
 		if (fatal)
 			atf_tc_fail("Module unload failed");
+	}
 	return err;
+}
 /*
  * A silent version of unload, to be called as part of the cleanup
  * process only.
  */
 static
-int
+void
 unload_cleanup(const char *name)
+{
 	(void)modctl(MODCTL_UNLOAD, __UNCONST(name));
+}
 /* --------------------------------------------------------------------- */
 /* Test cases                                                            */
 /* --------------------------------------------------------------------- */
 ATF_TC_WITH_CLEANUP(cmd_load);
 ATF_TC_HEAD(cmd_load, tc)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: k_helper.c,v 1.4 2010/08/21 13:21:48 pgoyette Exp $	*/
+/*	$NetBSD: k_helper.c,v 1.5 2010/11/03 16:10:23 christos Exp $	*/
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,45 +17,45 @@
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
  * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: k_helper.c,v 1.4 2010/08/21 13:21:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: k_helper.c,v 1.5 2010/11/03 16:10:23 christos Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <prop/proplib.h>
 MODULE(MODULE_CLASS_MISC, k_helper, NULL);
 /* --------------------------------------------------------------------- */
 /* Sysctl interface to query information about the module.               */
 /* --------------------------------------------------------------------- */
 /* TODO: Change the integer variables below that represent booleans to
  * bools, once sysctl(8) supports CTLTYPE_BOOL nodes. */
-static struct sysctllog *clog;
+static struct sysctllog *clogp;
 static int present = 1;
 static int prop_str_ok;
 static char prop_str_val[128];
 static int prop_int_ok;
 static int64_t prop_int_val;
 static int prop_int_load;
 #define K_HELPER 0x12345678
 #define K_HELPER_PRESENT 0
 #define K_HELPER_PROP_STR_OK 1
 #define K_HELPER_PROP_STR_VAL 2
 #define K_HELPER_PROP_INT_OK 3
 #define K_HELPER_PROP_INT_VAL 4
 @@ -153,37 +153,37 @@ k_helper_init(prop_dictionary_t props)
 		prop_int_val = -1;
 	p = prop_dictionary_get(props, "prop_recurse");
 	if (p != NULL && prop_object_type(p) == PROP_TYPE_STRING) {
 		const char *recurse_name = prop_string_cstring_nocopy(p);
 		if (recurse_name != NULL)
 			prop_int_load = module_load(recurse_name,
 			    MODCTL_NO_PROP, NULL, MODULE_CLASS_ANY);
 		else
 			prop_int_load = -1;
 	} else
 		prop_int_load = -2;
-	sysctl_k_helper_setup(&clog);
+	sysctl_k_helper_setup(&clogp);
 	return 0;
+}
 static
 int
 k_helper_fini(void *arg)
+{
-	sysctl_teardown(&clog);
+	sysctl_teardown(&clogp);
 	return 0;
+}
 static
 int
 k_helper_modcmd(modcmd_t cmd, void *arg)
+{
 	int ret;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		ret = k_helper_init(arg);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: k_helper2.c,v 1.1 2010/08/21 13:21:48 pgoyette Exp $ */
+/*	$NetBSD: k_helper2.c,v 1.2 2010/11/03 16:10:23 christos Exp $ */
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,45 +17,45 @@
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
  * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: k_helper2.c,v 1.1 2010/08/21 13:21:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: k_helper2.c,v 1.2 2010/11/03 16:10:23 christos Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <prop/proplib.h>
 MODULE(MODULE_CLASS_MISC, k_helper2, NULL);
 /* --------------------------------------------------------------------- */
 /* Sysctl interface to query information about the module.               */
 /* --------------------------------------------------------------------- */
 /* TODO: Change the integer variables below that represent booleans to
  * bools, once sysctl(8) supports CTLTYPE_BOOL nodes. */
-static struct sysctllog *clog;
+static struct sysctllog *clogp;
 static int present = 1;
 #define K_HELPER2 0x23456781
 #define K_HELPER_PRESENT 0
 SYSCTL_SETUP(sysctl_k_helper2_setup, "sysctl k_helper subtree setup")
+{
 	sysctl_createv(clog, 0, NULL, NULL,
 	               CTLFLAG_PERMANENT,
 	               CTLTYPE_NODE, "k_helper2", NULL,
 	               NULL, 0, NULL, 0,
 	               CTL_VENDOR, K_HELPER2, CTL_EOL);
 @@ -66,37 +66,37 @@ SYSCTL_SETUP(sysctl_k_helper2_setup, "sy
 		       SYSCTL_DESCR("Whether the module was loaded or not"),
 		       NULL, 0, &present, 0,
 	               CTL_VENDOR, K_HELPER2, K_HELPER_PRESENT, CTL_EOL);
+}
 /* --------------------------------------------------------------------- */
 /* Module management.                                                    */
 /* --------------------------------------------------------------------- */
 static
 int
 k_helper2_init(prop_dictionary_t props)
+{
-	sysctl_k_helper2_setup(&clog);
+	sysctl_k_helper2_setup(&clogp);
 	return 0;
+}
 static
 int
 k_helper2_fini(void *arg)
+{
-	sysctl_teardown(&clog);
+	sysctl_teardown(&clogp);
 	return 0;
+}
 static
 int
 k_helper2_modcmd(modcmd_t cmd, void *arg)
+{
 	int ret;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		ret = k_helper2_init(arg);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_basic.c,v 1.2 2010/08/11 13:10:03 pooka Exp $	*/
+/*	$NetBSD: t_basic.c,v 1.3 2010/11/03 16:10:24 christos Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,31 +19,32 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
  * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: t_basic.c,v 1.2 2010/08/11 13:10:03 pooka Exp $");
+__RCSID("$NetBSD: t_basic.c,v 1.3 2010/11/03 16:10:24 christos Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip_carp.h>
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 #include <atf-c.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -116,27 +117,27 @@ child(bool master)
 		netcfg_rump_if(ifname, "10.1.1.2", "255.255.255.0");
 	/* configure the carp interface */
 	ifr.ifr_data = &cr;
 	RL(rump_sys_ioctl(s, SIOCGVH, &ifr));
 	strlcpy(cr.carpr_carpdev, ifname, sizeof(cr.carpr_carpdev));
 	cr.carpr_vhid = 175;
 	if (master)
 		cr.carpr_advskew = 0;
 	else
 		cr.carpr_advskew = 200;
 	cr.carpr_advbase = 1;
-	strcpy(cr.carpr_key, "s3cret");
+	strcpy((char *)cr.carpr_key, "s3cret");
 	RL(rump_sys_ioctl(s, SIOCSVH, &ifr));
 	netcfg_rump_if(carpif, "10.1.1.100", "255.255.255.0");
 	/* tassa pause()en enka muuta voi */
 	pause();
+}
 ATF_TC_BODY(handover, tc)
+{
 	char ifname[IFNAMSIZ];
 	pid_t mpid, cpid;
 	int i, status;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_forward.c,v 1.5 2010/07/26 14:10:31 pooka Exp $	*/
+/*	$NetBSD: t_forward.c,v 1.6 2010/11/03 16:10:24 christos Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
  * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: t_forward.c,v 1.5 2010/07/26 14:10:31 pooka Exp $");
+__RCSID("$NetBSD: t_forward.c,v 1.6 2010/11/03 16:10:24 christos Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 @@ -57,27 +57,26 @@ __RCSID("$NetBSD: t_forward.c,v 1.5 2010
 #include <string.h>
 #include <unistd.h>
 #include "../../h_macros.h"
 #include "../config/netconfig.c"
 /*
  * Since our maxttl is in our private namespace, we don't need raw packet
  * construction like traceroute(8) -- we can just use the global maxttl.
  */
 static void
 sendttl(void)
+{
 	extern int rumpns_ip_defttl;
 	struct sockaddr_in sin;
 	char payload[1024];
 	char ifname[IFNAMSIZ];
 	int mib[4] = { CTL_NET, PF_INET, IPPROTO_IP, IPCTL_DEFTTL };
 	int nv;
 	int s;
 	netcfg_rump_makeshmif("bus1", ifname);
 	netcfg_rump_if(ifname, "1.0.0.1", "255.255.255.0");
 	netcfg_rump_route("0.0.0.0", "0.0.0.0", "1.0.0.2"); /* default router */
 	/* set global ttl to 1 */
 	nv = 1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_ping.c,v 1.8 2010/08/26 17:24:14 pooka Exp $	*/
+/*	$NetBSD: t_ping.c,v 1.9 2010/11/03 16:10:24 christos Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
  * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: t_ping.c,v 1.8 2010/08/26 17:24:14 pooka Exp $");
+__RCSID("$NetBSD: t_ping.c,v 1.9 2010/11/03 16:10:24 christos Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
 #include <atf-c.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -119,35 +119,35 @@ in_cksum(void *data, size_t len)
 	for (sum = 0; len > 1; len -= 2)
 		sum += *buf++;
 	if (len)
 		sum += *(uint8_t *)buf;
 	sum = (sum >> 16) + (sum & 0xffff);
 	sum += (sum >> 16);
 	return ~sum;
+}
 static int
-doping(const char *target, int loops, int pktsize)
+doping(const char *target, int loops, size_t pktsize)
+{
 	char sndbuf[IP_MAXPACKET - sizeof(struct ip)];
 	char recvbuf[IP_MAXPACKET];
 	struct sockaddr_in dst, pingee;
 	struct icmp *icmp;
 	socklen_t slen;
 	ssize_t n;
-	int loop, i, succ;
+	int loop, succ;
 	int x, xnon, s;
 	RL(s = rump_sys_socket(PF_INET, SOCK_RAW, IPPROTO_ICMP));
 	RL(x = rump_sys_fcntl(s, F_GETFL, 0));
 	xnon = x | O_NONBLOCK;
 	memset(&dst, 0, sizeof(dst));
 	dst.sin_len = sizeof(dst);
 	dst.sin_family = AF_INET;
 	dst.sin_addr.s_addr = inet_addr(target);
 	icmp = (struct icmp *)sndbuf;
 	memset(icmp, 0, sizeof(*icmp));
 @@ -387,27 +387,27 @@ ATF_TC_BODY(ping_of_death, tc)
 	icmp->icmp_cksum = in_cksum(icmp, sizeof(*icmp));
 	for (;;) {
 		int status;
 		/* resolve arp before sending raw stuff */
 		netcfg_rump_pingtest("1.1.1.10", 1);
 		for (tot = 0;
 		    tot < 65538 - sizeof(*ip);
 		    tot += (frag - sizeof(*ip))) {
 			frag = MIN(65538 - tot, sizeof(data));
 			ip->ip_off = tot >> 3;
-			assert(ip->ip_off << 3 == tot);
+			assert((size_t)ip->ip_off << 3 == tot);
 			ip->ip_len = frag;
 			if (frag == sizeof(data)) {
 				ip->ip_off |= IP_MF;
+			}
 			RL(rump_sys_sendto(s, data, frag, 0,
 			    (struct sockaddr *)&dst, sizeof(dst)));
+		}
 		if (waitpid(-1, &status, WNOHANG) > 0) {
 			if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
 				break;
 			atf_tc_fail("child did not exit clean");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_pr.c,v 1.2 2010/07/26 14:07:04 pooka Exp $	*/
+/*	$NetBSD: t_pr.c,v 1.3 2010/11/03 16:10:25 christos Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
  * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: t_pr.c,v 1.2 2010/07/26 14:07:04 pooka Exp $");
+__RCSID("$NetBSD: t_pr.c,v 1.3 2010/11/03 16:10:25 christos Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <net/route.h>
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 #include <atf-c.h>
 #include <errno.h>
 @@ -52,27 +52,26 @@ __RCSID("$NetBSD: t_pr.c,v 1.2 2010/07/2
 #include "../../h_macros.h"
 ATF_TC(loopmtu);
 ATF_TC_HEAD(loopmtu, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "test lo0 fragmentation");
 	/* PR kern/43664 */
+}
 ATF_TC_BODY(loopmtu, tc)
+{
 	char ifname[IFNAMSIZ];
 	size_t len;
 	struct {
 		struct rt_msghdr m_rtm;
 		struct sockaddr_in m_sin;
 	} m_rtmsg;
 #define rtm m_rtmsg.m_rtm
 #define rsin m_rtmsg.m_sin
 	struct sockaddr_in sin;
 	struct ifreq ifr;
 	char data[2000];
 	int s;
 	strcpy(ifname, "lo0");
 	rump_init();

 @@ -1,14 +1,14 @@
-/* $NetBSD: pwgr.c,v 1.2 2008/04/28 20:24:12 martin Exp $ */
+/* $NetBSD: pwgr.c,v 1.3 2010/11/03 16:10:26 christos Exp $ */
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -29,26 +29,27 @@
  * This file implements replacements for all user/group-related functions
  * called by id(1).  It provides fake but deterministic user and group
  * information.  The details are as such:
  * User root, uid 0, primary group 0 (wheel).
  * User test, uid 100, primary group 100 (users), secondary group 0 (wheel).
  */
 #include <sys/types.h>
 #include <errno.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 char Login[16];
 struct group GrEntry;
 struct passwd PwEntry;
 gid_t
 getgid(void)
+{
 	return 100;
+}
 gid_t
 @@ -79,51 +80,51 @@ char *
 getlogin(void)
+{
 	strcpy(Login, "test");
 	return Login;
+}
 struct group *
 getgrgid(gid_t gid)
+{
 	struct group *g = &GrEntry;
 	memset(g, 0, sizeof(*g));
 	if (gid == 0) {
-		g->gr_name = "wheel";
+		g->gr_name = __UNCONST("wheel");
 		g->gr_gid = 0;
 	} else if (gid == 100) {
-		g->gr_name = "users";
+		g->gr_name = __UNCONST("users");
 		g->gr_gid = 100;
 	} else
 		g = NULL;
 	return g;
+}
 int
-getgrouplist(const char *name, int basegid, int *groups, int *ngroups)
+getgrouplist(const char *name, gid_t basegid, gid_t *groups, int *ngroups)
+{
 	int cnt, ret;
-	if (name == "root") {
+	if (strcmp(name, "root") == 0) {
 		if (*ngroups >= 1) {
 			groups[0] = basegid;
 			cnt = 1;
+		}
 		ret = (*ngroups >= cnt) ? 0 : -1;
 		*ngroups = cnt;
-	} else if (name == "test") {
+	} else if (strcmp(name, "test") == 0) {
 		if (*ngroups >= 1) {
 			groups[0] = basegid;
 			cnt = 1;
+		}
 		if (*ngroups >= 2) {
 			groups[1] = 0;
 			cnt = 2;
+		}
 		ret = (*ngroups >= cnt) ? 0 : -1;
 		*ngroups = cnt;
 	} else
 @@ -142,45 +143,45 @@ getgroups(int gidsetlen, gid_t *gidset)
 	gidset[0] = 100;
 	gidset[1] = 0;
 	return 2;
+}
 struct passwd *
 getpwnam(const char *login)
+{
 	struct passwd *p = &PwEntry;
 	memset(p, 0, sizeof(*p));
 	if (strcmp(login, "root") == 0) {
-		p->pw_name = "root";
+		p->pw_name = __UNCONST("root");
 		p->pw_uid = 0;
 		p->pw_gid = 0;
 	} else if (strcmp(login, "test") == 0) {
-		p->pw_name = "test";
+		p->pw_name = __UNCONST("test");
 		p->pw_uid = 100;
 		p->pw_gid = 100;
 	} else
 		p = NULL;
 	return p;
+}
 struct passwd *
 getpwuid(uid_t uid)
+{
 	struct passwd *p = &PwEntry;
 	memset(p, 0, sizeof(*p));
 	if (uid == 0) {
-		p->pw_name = "root";
+		p->pw_name = __UNCONST("root");
 		p->pw_uid = 0;
 		p->pw_gid = 0;
 	} else if (uid == 100) {
-		p->pw_name = "test";
+		p->pw_name = __UNCONST("test");
 		p->pw_uid = 100;
 		p->pw_gid = 100;
 	} else
 		p = NULL;
 	return p;
+}

 @@ -1,17 +1,18 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/07/13 21:13:21 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.4 2010/11/03 16:10:19 christos Exp $
 .include <bsd.own.mk>
 # Not yet
 # .include "../Makefile.inc"
 TESTSDIR=	${TESTSBASE}/crypto/libcrypto
 ATFFILE=	no
 .if defined(HELPER_NAME)
 HELPER_SRCS?=	${HELPER_NAME}.c
 PROG=		h_${HELPER_NAME}
 SRCS=		${HELPER_SRCS}
 MAN=		# empty
 BINDIR=		${TESTSDIR}
 DPADD+=		${LIBCRYPTO} ${LIBCRYPT}
 LDADD+=		-lcrypto -lcrypt

 @@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2010/09/09 22:25:38 christos Exp $
+# $NetBSD: Makefile,v 1.7 2010/11/03 16:10:21 christos Exp $
 .include <bsd.own.mk>
-TESTS_SUBDIRS+=	gen hash stdlib
+TESTS_SUBDIRS+=	gen hash stdlib stdio
 # Disabled for now, only test in there is very expensive
-#SUBDIR+=	 string
+SUBDIR+=	 string
 TESTSDIR=	${TESTSBASE}/lib/libc
 .include <bsd.test.mk>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getmntinfo.c,v 1.3 2008/04/28 20:24:12 martin Exp $	*/
+/*	$NetBSD: getmntinfo.c,v 1.4 2010/11/03 16:10:25 christos Exp $	*/
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -169,27 +169,27 @@ setup_strpct(void)
 #undef AVAIL
 #undef USED
 #undef TOTAL
 #undef BSIZE
 	};
 	*getnewstatvfs() = tmpl;
+}
 /*
  * Parameter taken from:
  * http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=23600
  */
-void
+static void
 setup_pr23600(void)
+{
 	static const struct statvfs tmpl = {
 #define	BSIZE	512
 #define	TOTAL	20971376ULL
 #define	USED	5719864ULL
 #define	AVAIL	15251512ULL
 		.f_bsize = BSIZE,
 		.f_frsize = BSIZE,
 		.f_blocks = TOTAL,
 		.f_bfree = TOTAL - USED,
 		.f_bavail = AVAIL,
 		.f_bresvd = TOTAL - USED - AVAIL,

 @@ -1,41 +1,40 @@
-/*	$NetBSD: t_pr.c,v 1.2 2010/07/03 08:18:30 jmmv Exp $	*/
+/*	$NetBSD: t_pr.c,v 1.3 2010/11/03 16:10:20 christos Exp $	*/
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <atf-c.h>
 #include <fcntl.h>
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 ATF_TC(ptyioctl);
 ATF_TC_HEAD(ptyioctl, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "ioctl on pty");
+}
 ATF_TC_BODY(ptyioctl, tc)
+{
 	struct termios tio;
 	int fd;
 	rump_init();
 	fd = rump_sys_open("/dev/ptyp1", O_RDWR);
-	if (fd == -1)
+	ATF_CHECK(fd != -1);
 		err(1, "open");
 	/* boom, dies with null deref under ptcwakeup() */
 	atf_tc_expect_signal(-1, "PR kern/40688");
 	rump_sys_ioctl(fd, TIOCGETA, &tio);
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, ptyioctl);
 	return atf_no_error();
+}

 @@ -1,23 +1,24 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <net/bpf.h>
 #include <atf-c.h>
 #include <fcntl.h>
 #include <rump/rump.h>
 #include <rump/rumpuser.h>
 #include <rump/rump_syscalls.h>
 ATF_TC(div_by_zero);
 ATF_TC_HEAD(div_by_zero, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Check that BPF rejects a filter "
 	    "which divides by 0");
+}
 ATF_TC_BODY(div_by_zero, tc)
+{
 	struct bpf_program bp;
 	int fd;
 @@ -29,25 +30,24 @@ ATF_TC_BODY(div_by_zero, tc)
 	struct bpf_insn bins[] = {
 	    { 0x20, 0, 0, 0x00000000 },
 	    { 0x34, 0, 0, 0x00000000 },
 	    { 0x15, 0, 1, 0x00000002 },
 	    { 0x6, 0, 0, 0x00000060 },
 	    { 0x6, 0, 0, 0x00000000 },
 	};
 	bp.bf_len = __arraycount(bins);
 	bp.bf_insns = bins;
 	rump_init();
 	fd = rump_sys_open("/dev/bpf", O_RDWR);
-	if (fd == -1)
+	ATF_CHECK(fd != -1);
 		err(1, "open bpf");
 	ATF_REQUIRE_EQ_MSG(rump_sys_ioctl(fd, BIOCSETF, &bp), -1,
 	    "bpf accepted program with division by zero");
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, div_by_zero);
 	return atf_no_error();
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_connect.c,v 1.3 2010/06/12 15:01:04 wiz Exp $	*/
+/*	$NetBSD: t_connect.c,v 1.4 2010/11/03 16:10:25 christos Exp $	*/
 /*
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -64,30 +64,31 @@ ATF_TC_BODY(low_port, tc)
 	val = IP_PORTRANGE_LOW;
 	if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE, &val,
 	    sizeof(val)) == -1)
 		atf_tc_fail("setsockopt failed: %s", strerror(errno));
 	memset(&sin, 0, sizeof(sin));
 	sin.sin_port = htons(31522);
 	sin.sin_addr.s_addr = inet_addr("127.0.0.1");
 	sin.sin_family = AF_INET;
 	if (connect(sd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
-		int err = errno;
+		int serrno = errno;
 		atf_tc_fail("connect failed: %s%s",
-		    strerror(err),
+		    strerror(serrno),
-		    err != EACCES ? "" : " (see http://mail-index.netbsd.org/"
+		    serrno != EACCES ? "" :
 		    " (see http://mail-index.netbsd.org/"
 		    "source-changes/2007/12/16/0011.html)");
+	}
 	slen = sizeof(sin);
 	ATF_REQUIRE_EQ(getsockname(sd, (struct sockaddr *)&sin, &slen), 0);
 	ATF_REQUIRE_EQ(slen, sizeof(sin));
 	ATF_REQUIRE(ntohs(sin.sin_port) <= IPPORT_RESERVEDMAX);
 	close(sd);
+}
 ATF_TP_ADD_TCS(tp)
+{