Module Name: src
Committed By: joerg
Date: Thu Jun 16 15:33:25 UTC 2011
Modified Files:
src/tests: h_macros.h
src/tests/fs/ffs: t_quota2_1.c t_quota2_remount.c
src/tests/lib/libc/gen: t_getcwd.c
src/tests/syscall: t_mincore.c t_mprotect.c t_msync.c t_umask.c
Log Message:
Use proper format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/h_macros.h
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/ffs/t_quota2_1.c \
src/tests/fs/ffs/t_quota2_remount.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/gen/t_getcwd.c
cvs rdiff -u -r1.1 -r1.2 src/tests/syscall/t_mincore.c
cvs rdiff -u -r1.6 -r1.7 src/tests/syscall/t_mprotect.c
cvs rdiff -u -r1.3 -r1.4 src/tests/syscall/t_msync.c
cvs rdiff -u -r1.2 -r1.3 src/tests/syscall/t_umask.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/h_macros.h
diff -u src/tests/h_macros.h:1.6 src/tests/h_macros.h:1.7
--- src/tests/h_macros.h:1.6 Tue Aug 31 17:21:14 2010
+++ src/tests/h_macros.h Thu Jun 16 15:33:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: h_macros.h,v 1.6 2010/08/31 17:21:14 pooka Exp $ */
+/* $NetBSD: h_macros.h,v 1.7 2011/06/16 15:33:24 joerg Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
strlcat(buf, ": ", sizeof(buf));
strlcat(buf, strerror(sverrno), sizeof(buf));
- atf_tc_fail(buf);
+ atf_tc_fail("%s", buf);
}
static __inline void
Index: src/tests/fs/ffs/t_quota2_1.c
diff -u src/tests/fs/ffs/t_quota2_1.c:1.2 src/tests/fs/ffs/t_quota2_1.c:1.3
--- src/tests/fs/ffs/t_quota2_1.c:1.2 Sun Mar 6 17:08:40 2011
+++ src/tests/fs/ffs/t_quota2_1.c Thu Jun 16 15:33:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_quota2_1.c,v 1.2 2011/03/06 17:08:40 bouyer Exp $ */
+/* $NetBSD: t_quota2_1.c,v 1.3 2011/06/16 15:33:24 joerg Exp $ */
/*
* Basic tests for quota2
@@ -63,10 +63,8 @@
}
snprintf(buf, 1024, "fsck_ffs -fn -F %s", FSTEST_IMGNAME);
res = system(buf);
- if (res != 0) {
- snprintf(buf, sizeof(buf), "fsck returned %d", res);
- atf_tc_fail(buf);
- }
+ if (res != 0)
+ atf_tc_fail("fsck returned %d", res);
}
#define DECL_TEST(nent, newops, name, descr, log) \
Index: src/tests/fs/ffs/t_quota2_remount.c
diff -u src/tests/fs/ffs/t_quota2_remount.c:1.2 src/tests/fs/ffs/t_quota2_remount.c:1.3
--- src/tests/fs/ffs/t_quota2_remount.c:1.2 Sun Mar 6 17:08:40 2011
+++ src/tests/fs/ffs/t_quota2_remount.c Thu Jun 16 15:33:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_quota2_remount.c,v 1.2 2011/03/06 17:08:40 bouyer Exp $ */
+/* $NetBSD: t_quota2_remount.c,v 1.3 2011/06/16 15:33:25 joerg Exp $ */
/*
* Basic tests for quota2
@@ -95,10 +95,8 @@
}
snprintf(buf, 1024, "fsck_ffs -fn -F %s", FSTEST_IMGNAME);
res = system(buf);
- if (res != 0) {
- snprintf(buf, sizeof(buf), "fsck returned %d", res);
- atf_tc_fail(buf);
- }
+ if (res != 0)
+ atf_tc_fail("fsck returned %d", res);
}
#define DECL_TEST(nent, newops, name, descr, log) \
Index: src/tests/lib/libc/gen/t_getcwd.c
diff -u src/tests/lib/libc/gen/t_getcwd.c:1.1 src/tests/lib/libc/gen/t_getcwd.c:1.2
--- src/tests/lib/libc/gen/t_getcwd.c:1.1 Sun Apr 10 06:27:21 2011
+++ src/tests/lib/libc/gen/t_getcwd.c Thu Jun 16 15:33:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_getcwd.c,v 1.1 2011/04/10 06:27:21 jruoho Exp $ */
+/* $NetBSD: t_getcwd.c,v 1.2 2011/06/16 15:33:25 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getcwd.c,v 1.1 2011/04/10 06:27:21 jruoho Exp $");
+__RCSID("$NetBSD: t_getcwd.c,v 1.2 2011/06/16 15:33:25 joerg Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -133,7 +133,7 @@
(void)fts_close(fts);
if (str != NULL)
- atf_tc_fail(str);
+ atf_tc_fail("%s", str);
}
ATF_TP_ADD_TCS(tp)
Index: src/tests/syscall/t_mincore.c
diff -u src/tests/syscall/t_mincore.c:1.1 src/tests/syscall/t_mincore.c:1.2
--- src/tests/syscall/t_mincore.c:1.1 Thu Jun 2 10:48:55 2011
+++ src/tests/syscall/t_mincore.c Thu Jun 16 15:33:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mincore.c,v 1.1 2011/06/02 10:48:55 jruoho Exp $ */
+/* $NetBSD: t_mincore.c,v 1.2 2011/06/16 15:33:25 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mincore.c,v 1.1 2011/06/02 10:48:55 jruoho Exp $");
+__RCSID("$NetBSD: t_mincore.c,v 1.2 2011/06/16 15:33:25 joerg Exp $");
#include <sys/mman.h>
@@ -168,7 +168,7 @@
}
if (str != NULL)
- atf_tc_fail(str);
+ atf_tc_fail("%s", str);
}
ATF_TC_CLEANUP(mincore_incore, tc)
Index: src/tests/syscall/t_mprotect.c
diff -u src/tests/syscall/t_mprotect.c:1.6 src/tests/syscall/t_mprotect.c:1.7
--- src/tests/syscall/t_mprotect.c:1.6 Fri May 6 22:24:41 2011
+++ src/tests/syscall/t_mprotect.c Thu Jun 16 15:33:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mprotect.c,v 1.6 2011/05/06 22:24:41 njoly Exp $ */
+/* $NetBSD: t_mprotect.c,v 1.7 2011/06/16 15:33:25 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mprotect.c,v 1.6 2011/05/06 22:24:41 njoly Exp $");
+__RCSID("$NetBSD: t_mprotect.c,v 1.7 2011/06/16 15:33:25 joerg Exp $");
#include <sys/param.h>
#include <sys/mman.h>
@@ -218,7 +218,7 @@
(void)paxset(pax_global, pax_enabled);
if (str != NULL)
- atf_tc_fail(str);
+ atf_tc_fail("%s", str);
}
ATF_TC(mprotect_write);
Index: src/tests/syscall/t_msync.c
diff -u src/tests/syscall/t_msync.c:1.3 src/tests/syscall/t_msync.c:1.4
--- src/tests/syscall/t_msync.c:1.3 Mon Apr 25 22:29:35 2011
+++ src/tests/syscall/t_msync.c Thu Jun 16 15:33:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_msync.c,v 1.3 2011/04/25 22:29:35 njoly Exp $ */
+/* $NetBSD: t_msync.c,v 1.4 2011/06/16 15:33:25 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_msync.c,v 1.3 2011/04/25 22:29:35 njoly Exp $");
+__RCSID("$NetBSD: t_msync.c,v 1.4 2011/06/16 15:33:25 joerg Exp $");
#include <sys/mman.h>
@@ -153,7 +153,7 @@
str = msync_sync("garbage", MS_ASYNC);
if (str != NULL)
- atf_tc_fail(str);
+ atf_tc_fail("%s", str);
}
ATF_TC(msync_err);
@@ -190,7 +190,7 @@
str = msync_sync("garbage", MS_INVALIDATE);
if (str != NULL)
- atf_tc_fail(str);
+ atf_tc_fail("%s", str);
}
ATF_TC(msync_sync);
@@ -206,7 +206,7 @@
str = msync_sync("garbage", MS_SYNC);
if (str != NULL)
- atf_tc_fail(str);
+ atf_tc_fail("%s", str);
}
ATF_TP_ADD_TCS(tp)
Index: src/tests/syscall/t_umask.c
diff -u src/tests/syscall/t_umask.c:1.2 src/tests/syscall/t_umask.c:1.3
--- src/tests/syscall/t_umask.c:1.2 Mon Apr 25 22:29:35 2011
+++ src/tests/syscall/t_umask.c Thu Jun 16 15:33:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_umask.c,v 1.2 2011/04/25 22:29:35 njoly Exp $ */
+/* $NetBSD: t_umask.c,v 1.3 2011/06/16 15:33:25 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_umask.c,v 1.2 2011/04/25 22:29:35 njoly Exp $");
+__RCSID("$NetBSD: t_umask.c,v 1.3 2011/06/16 15:33:25 joerg Exp $");
#include <sys/stat.h>
#include <sys/wait.h>
@@ -152,7 +152,7 @@
(void)umask(S_IWGRP | S_IWOTH);
if (str != NULL)
- atf_tc_fail(str);
+ atf_tc_fail("%s", str);
}
ATF_TC_CLEANUP(umask_open, tc)
