aboutsummaryrefslogtreecommitdiff
path: root/tests/tap/basic.h
diff options
context:
space:
mode:
authorRuss Allbery <rra@dropbox.com>2016-02-03 12:44:33 -0800
committerRuss Allbery <rra@dropbox.com>2016-02-03 12:44:33 -0800
commit2a53df4444cb8a931e82c584288025e315f40121 (patch)
tree7c8b9bfa69cf613a22ba6be616a0d3fdb4146e4e /tests/tap/basic.h
parent294d46a917b6aa3af305c3d50b8d83a1f3fb5694 (diff)
parente64d4e31146b87046916c377557f8ea789da3f0a (diff)
Merge branch 'debian/master' into ubuntu/precise
Diffstat (limited to 'tests/tap/basic.h')
-rw-r--r--tests/tap/basic.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/tap/basic.h b/tests/tap/basic.h
index c002df9..4ecaaec 100644
--- a/tests/tap/basic.h
+++ b/tests/tap/basic.h
@@ -4,7 +4,8 @@
* This file is part of C TAP Harness. The current version plus supporting
* documentation is at <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
*
- * Copyright 2009, 2010, 2011, 2012, 2013, 2014 Russ Allbery <eagle@eyrie.org>
+ * Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015
+ * Russ Allbery <eagle@eyrie.org>
* Copyright 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2011, 2012, 2014
* The Board of Trustees of the Leland Stanford Junior University
*
@@ -72,7 +73,8 @@ void skip_all(const char *format, ...)
*/
int ok(int success, const char *format, ...)
__attribute__((__format__(printf, 2, 3)));
-int okv(int success, const char *format, va_list args);
+int okv(int success, const char *format, va_list args)
+ __attribute__((__format__(printf, 2, 0)));
void skip(const char *reason, ...)
__attribute__((__format__(printf, 1, 2)));
@@ -155,7 +157,7 @@ void test_tmpdir_free(char *path);
* registered functions will be run during atexit handling (and are therefore
* subject to all the same constraints and caveats as atexit functions).
*
- * The function must return void and will be passed two argument, an int that
+ * The function must return void and will be passed two arguments: an int that
* will be true if the test completed successfully and false otherwise, and an
* int that will be true if the cleanup function is run in the primary process
* (the one that called plan or plan_lazy) and false otherwise.