Module Name: src
Committed By: joerg
Date: Tue Jan 7 02:06:42 UTC 2014
Modified Files:
src/external/bsd/atf/dist/atf-c: error.h tc.c tc.h
src/external/bsd/atf/dist/atf-c++: tests.cpp
src/external/bsd/atf/dist/atf-c/detail: dynstr.c dynstr.h fs.c fs.h
sanity.c test_helpers.c text.h tp_main.c
Log Message:
Format string annotations and fixes for resulting fallout.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/atf/dist/atf-c/error.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/dist/atf-c/tc.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/tc.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/dist/atf-c++/tests.cpp
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-c/detail/dynstr.c \
src/external/bsd/atf/dist/atf-c/detail/dynstr.h \
src/external/bsd/atf/dist/atf-c/detail/fs.c \
src/external/bsd/atf/dist/atf-c/detail/fs.h \
src/external/bsd/atf/dist/atf-c/detail/text.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/atf-c/detail/sanity.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/atf/dist/atf-c/detail/tp_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/error.h
diff -u src/external/bsd/atf/dist/atf-c/error.h:1.1.1.4 src/external/bsd/atf/dist/atf-c/error.h:1.2
--- src/external/bsd/atf/dist/atf-c/error.h:1.1.1.4 Mon Jan 16 22:36:30 2012
+++ src/external/bsd/atf/dist/atf-c/error.h Tue Jan 7 02:06:42 2014
@@ -33,6 +33,7 @@
#include <stdbool.h>
#include <stddef.h>
+#include <atf-c/defs.h>
#include <atf-c/error_fwd.h>
/* ---------------------------------------------------------------------
@@ -62,7 +63,8 @@ void atf_error_format(const atf_error_t,
* Common error types.
* --------------------------------------------------------------------- */
-atf_error_t atf_libc_error(int, const char *, ...);
+atf_error_t atf_libc_error(int, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
int atf_libc_error_code(const atf_error_t);
const char *atf_libc_error_msg(const atf_error_t);
Index: src/external/bsd/atf/dist/atf-c/tc.c
diff -u src/external/bsd/atf/dist/atf-c/tc.c:1.12 src/external/bsd/atf/dist/atf-c/tc.c:1.13
--- src/external/bsd/atf/dist/atf-c/tc.c:1.12 Mon Jan 16 22:41:30 2012
+++ src/external/bsd/atf/dist/atf-c/tc.c Tue Jan 7 02:06:42 2014
@@ -79,12 +79,14 @@ struct context {
static void context_init(struct context *, const atf_tc_t *, const char *);
static void check_fatal_error(atf_error_t);
static void report_fatal_error(const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2)
ATF_DEFS_ATTRIBUTE_NORETURN;
static atf_error_t write_resfile(const int, const char *, const int,
const atf_dynstr_t *);
static void create_resfile(const char *, const char *, const int,
atf_dynstr_t *);
static void error_in_expect(struct context *, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3)
ATF_DEFS_ATTRIBUTE_NORETURN;
static void validate_expect(struct context *);
static void expected_failure(struct context *, atf_dynstr_t *)
@@ -97,9 +99,11 @@ static void pass(struct context *)
static void skip(struct context *, atf_dynstr_t *)
ATF_DEFS_ATTRIBUTE_NORETURN;
static void format_reason_ap(atf_dynstr_t *, const char *, const size_t,
- const char *, va_list);
+ const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(4, 0);
static void format_reason_fmt(atf_dynstr_t *, const char *, const size_t,
- const char *, ...);
+ const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(4, 5);
static void errno_test(struct context *, const char *, const size_t,
const int, const char *, const bool,
void (*)(struct context *, atf_dynstr_t *));
@@ -571,7 +575,7 @@ atf_tc_init(atf_tc_t *tc, const char *id
if (atf_is_error(err))
goto err_vars;
- err = atf_tc_set_md_var(tc, "ident", ident);
+ err = atf_tc_set_md_var(tc, "ident", "%s", ident);
if (atf_is_error(err))
goto err_map;
@@ -787,28 +791,35 @@ atf_tc_set_md_var(atf_tc_t *tc, const ch
* --------------------------------------------------------------------- */
static void _atf_tc_fail(struct context *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0)
ATF_DEFS_ATTRIBUTE_NORETURN;
-static void _atf_tc_fail_nonfatal(struct context *, const char *, va_list);
+static void _atf_tc_fail_nonfatal(struct context *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
static void _atf_tc_fail_check(struct context *, const char *, const size_t,
- const char *, va_list);
+ const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(4, 0);
static void _atf_tc_fail_requirement(struct context *, const char *,
- const size_t, const char *, va_list) ATF_DEFS_ATTRIBUTE_NORETURN;
+ const size_t, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_NORETURN
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(4, 0);
static void _atf_tc_pass(struct context *) ATF_DEFS_ATTRIBUTE_NORETURN;
static void _atf_tc_require_prog(struct context *, const char *);
static void _atf_tc_skip(struct context *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0)
ATF_DEFS_ATTRIBUTE_NORETURN;
static void _atf_tc_check_errno(struct context *, const char *, const size_t,
const int, const char *, const bool);
static void _atf_tc_require_errno(struct context *, const char *, const size_t,
const int, const char *, const bool);
static void _atf_tc_expect_pass(struct context *);
-static void _atf_tc_expect_fail(struct context *, const char *, va_list);
+static void _atf_tc_expect_fail(struct context *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
static void _atf_tc_expect_exit(struct context *, const int, const char *,
- va_list);
+ va_list) ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(3, 0);
static void _atf_tc_expect_signal(struct context *, const int, const char *,
- va_list);
+ va_list) ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(3, 0);
static void _atf_tc_expect_death(struct context *, const char *,
- va_list);
+ va_list) ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
static void
_atf_tc_fail(struct context *ctx, const char *fmt, va_list ap)
@@ -982,6 +993,7 @@ _atf_tc_expect_death(struct context *ctx
create_resfile(ctx->resfile, "expected_death", -1, &formatted);
}
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0)
static void
_atf_tc_expect_timeout(struct context *ctx, const char *reason, va_list ap)
{
@@ -1016,13 +1028,13 @@ atf_tc_run(const atf_tc_t *tc, const cha
if (Current.fail_count > 0) {
atf_dynstr_t reason;
- format_reason_fmt(&reason, NULL, 0, "%d checks failed; see output for "
+ format_reason_fmt(&reason, NULL, 0, "%zu checks failed; see output for "
"more details", Current.fail_count);
fail_requirement(&Current, &reason);
} else if (Current.expect_fail_count > 0) {
atf_dynstr_t reason;
- format_reason_fmt(&reason, NULL, 0, "%d checks failed as expected; "
+ format_reason_fmt(&reason, NULL, 0, "%zu checks failed as expected; "
"see output for more details", Current.expect_fail_count);
expected_failure(&Current, &reason);
} else {
Index: src/external/bsd/atf/dist/atf-c/tc.h
diff -u src/external/bsd/atf/dist/atf-c/tc.h:1.4 src/external/bsd/atf/dist/atf-c/tc.h:1.5
--- src/external/bsd/atf/dist/atf-c/tc.h:1.4 Mon Jan 16 22:41:30 2012
+++ src/external/bsd/atf/dist/atf-c/tc.h Tue Jan 7 02:06:42 2014
@@ -93,7 +93,8 @@ bool atf_tc_has_config_var(const atf_tc_
bool atf_tc_has_md_var(const atf_tc_t *, const char *);
/* Modifiers. */
-atf_error_t atf_tc_set_md_var(atf_tc_t *, const char *, const char *, ...);
+atf_error_t atf_tc_set_md_var(atf_tc_t *, const char *, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(3, 4);
/* ---------------------------------------------------------------------
* Free functions.
Index: src/external/bsd/atf/dist/atf-c++/tests.cpp
diff -u src/external/bsd/atf/dist/atf-c++/tests.cpp:1.9 src/external/bsd/atf/dist/atf-c++/tests.cpp:1.10
--- src/external/bsd/atf/dist/atf-c++/tests.cpp:1.9 Fri Feb 15 17:08:00 2013
+++ src/external/bsd/atf/dist/atf-c++/tests.cpp Tue Jan 7 02:06:42 2014
@@ -269,7 +269,7 @@ impl::tc::get_md_vars(void)
void
impl::tc::set_md_var(const std::string& var, const std::string& val)
{
- atf_error_t err = atf_tc_set_md_var(&pimpl->m_tc, var.c_str(), val.c_str());
+ atf_error_t err = atf_tc_set_md_var(&pimpl->m_tc, var.c_str(), "%s", val.c_str());
if (atf_is_error(err))
throw_atf_error(err);
}
Index: src/external/bsd/atf/dist/atf-c/detail/dynstr.c
diff -u src/external/bsd/atf/dist/atf-c/detail/dynstr.c:1.1.1.2 src/external/bsd/atf/dist/atf-c/detail/dynstr.c:1.2
--- src/external/bsd/atf/dist/atf-c/detail/dynstr.c:1.1.1.2 Mon Jan 16 22:36:36 2012
+++ src/external/bsd/atf/dist/atf-c/detail/dynstr.c Tue Jan 7 02:06:42 2014
@@ -67,6 +67,7 @@ resize(atf_dynstr_t *ad, size_t newsize)
return err;
}
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0)
static
atf_error_t
prepend_or_append(atf_dynstr_t *ad, const char *fmt, va_list ap,
Index: src/external/bsd/atf/dist/atf-c/detail/dynstr.h
diff -u src/external/bsd/atf/dist/atf-c/detail/dynstr.h:1.1.1.2 src/external/bsd/atf/dist/atf-c/detail/dynstr.h:1.2
--- src/external/bsd/atf/dist/atf-c/detail/dynstr.h:1.1.1.2 Mon Jan 16 22:36:36 2012
+++ src/external/bsd/atf/dist/atf-c/detail/dynstr.h Tue Jan 7 02:06:42 2014
@@ -52,8 +52,10 @@ extern const size_t atf_dynstr_npos;
/* Constructors and destructors */
atf_error_t atf_dynstr_init(atf_dynstr_t *);
-atf_error_t atf_dynstr_init_ap(atf_dynstr_t *, const char *, va_list);
-atf_error_t atf_dynstr_init_fmt(atf_dynstr_t *, const char *, ...);
+atf_error_t atf_dynstr_init_ap(atf_dynstr_t *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
+atf_error_t atf_dynstr_init_fmt(atf_dynstr_t *, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
atf_error_t atf_dynstr_init_raw(atf_dynstr_t *, const void *, size_t);
atf_error_t atf_dynstr_init_rep(atf_dynstr_t *, size_t, char);
atf_error_t atf_dynstr_init_substr(atf_dynstr_t *, const atf_dynstr_t *,
@@ -68,11 +70,15 @@ size_t atf_dynstr_length(const atf_dynst
size_t atf_dynstr_rfind_ch(const atf_dynstr_t *, char);
/* Modifiers */
-atf_error_t atf_dynstr_append_ap(atf_dynstr_t *, const char *, va_list);
-atf_error_t atf_dynstr_append_fmt(atf_dynstr_t *, const char *, ...);
+atf_error_t atf_dynstr_append_ap(atf_dynstr_t *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
+atf_error_t atf_dynstr_append_fmt(atf_dynstr_t *, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
void atf_dynstr_clear(atf_dynstr_t *);
-atf_error_t atf_dynstr_prepend_ap(atf_dynstr_t *, const char *, va_list);
-atf_error_t atf_dynstr_prepend_fmt(atf_dynstr_t *, const char *, ...);
+atf_error_t atf_dynstr_prepend_ap(atf_dynstr_t *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
+atf_error_t atf_dynstr_prepend_fmt(atf_dynstr_t *, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
/* Operators */
bool atf_equal_dynstr_cstring(const atf_dynstr_t *, const char *);
Index: src/external/bsd/atf/dist/atf-c/detail/fs.c
diff -u src/external/bsd/atf/dist/atf-c/detail/fs.c:1.1.1.2 src/external/bsd/atf/dist/atf-c/detail/fs.c:1.2
--- src/external/bsd/atf/dist/atf-c/detail/fs.c:1.1.1.2 Mon Jan 16 22:36:36 2012
+++ src/external/bsd/atf/dist/atf-c/detail/fs.c Tue Jan 7 02:06:42 2014
@@ -63,7 +63,8 @@ static atf_error_t copy_contents(const a
static mode_t current_umask(void);
static atf_error_t do_mkdtemp(char *);
static atf_error_t normalize(atf_dynstr_t *, char *);
-static atf_error_t normalize_ap(atf_dynstr_t *, const char *, va_list);
+static atf_error_t normalize_ap(atf_dynstr_t *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
static void replace_contents(atf_fs_path_t *, const char *);
static const char *stat_type_to_string(const int);
Index: src/external/bsd/atf/dist/atf-c/detail/fs.h
diff -u src/external/bsd/atf/dist/atf-c/detail/fs.h:1.1.1.2 src/external/bsd/atf/dist/atf-c/detail/fs.h:1.2
--- src/external/bsd/atf/dist/atf-c/detail/fs.h:1.1.1.2 Mon Jan 16 22:36:36 2012
+++ src/external/bsd/atf/dist/atf-c/detail/fs.h Tue Jan 7 02:06:42 2014
@@ -36,6 +36,7 @@
#include <stdarg.h>
#include <stdbool.h>
+#include <atf-c/defs.h>
#include <atf-c/error_fwd.h>
#include "dynstr.h"
@@ -50,8 +51,10 @@ struct atf_fs_path {
typedef struct atf_fs_path atf_fs_path_t;
/* Constructors/destructors. */
-atf_error_t atf_fs_path_init_ap(atf_fs_path_t *, const char *, va_list);
-atf_error_t atf_fs_path_init_fmt(atf_fs_path_t *, const char *, ...);
+atf_error_t atf_fs_path_init_ap(atf_fs_path_t *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
+atf_error_t atf_fs_path_init_fmt(atf_fs_path_t *, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
atf_error_t atf_fs_path_copy(atf_fs_path_t *, const atf_fs_path_t *);
void atf_fs_path_fini(atf_fs_path_t *);
@@ -63,8 +66,10 @@ bool atf_fs_path_is_absolute(const atf_f
bool atf_fs_path_is_root(const atf_fs_path_t *);
/* Modifiers. */
-atf_error_t atf_fs_path_append_ap(atf_fs_path_t *, const char *, va_list);
-atf_error_t atf_fs_path_append_fmt(atf_fs_path_t *, const char *, ...);
+atf_error_t atf_fs_path_append_ap(atf_fs_path_t *, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
+atf_error_t atf_fs_path_append_fmt(atf_fs_path_t *, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
atf_error_t atf_fs_path_append_path(atf_fs_path_t *, const atf_fs_path_t *);
atf_error_t atf_fs_path_to_absolute(const atf_fs_path_t *, atf_fs_path_t *);
Index: src/external/bsd/atf/dist/atf-c/detail/text.h
diff -u src/external/bsd/atf/dist/atf-c/detail/text.h:1.1.1.2 src/external/bsd/atf/dist/atf-c/detail/text.h:1.2
--- src/external/bsd/atf/dist/atf-c/detail/text.h:1.1.1.2 Mon Jan 16 22:36:37 2012
+++ src/external/bsd/atf/dist/atf-c/detail/text.h Tue Jan 7 02:06:42 2014
@@ -34,14 +34,17 @@
#include <stdbool.h>
#include <atf-c/error_fwd.h>
+#include <atf-c/defs.h>
#include "list.h"
atf_error_t atf_text_for_each_word(const char *, const char *,
atf_error_t (*)(const char *, void *),
void *);
-atf_error_t atf_text_format(char **, const char *, ...);
-atf_error_t atf_text_format_ap(char **, const char *, va_list);
+atf_error_t atf_text_format(char **, const char *, ...)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
+atf_error_t atf_text_format_ap(char **, const char *, va_list)
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
atf_error_t atf_text_split(const char *, const char *, atf_list_t *);
atf_error_t atf_text_to_bool(const char *, bool *);
atf_error_t atf_text_to_long(const char *, long *);
Index: src/external/bsd/atf/dist/atf-c/detail/sanity.c
diff -u src/external/bsd/atf/dist/atf-c/detail/sanity.c:1.1.1.1 src/external/bsd/atf/dist/atf-c/detail/sanity.c:1.2
--- src/external/bsd/atf/dist/atf-c/detail/sanity.c:1.1.1.1 Wed Oct 20 09:14:19 2010
+++ src/external/bsd/atf/dist/atf-c/detail/sanity.c Tue Jan 7 02:06:42 2014
@@ -36,8 +36,10 @@
#include <stdio.h>
#include <stdlib.h>
+#include <atf-c/defs.h>
#include "sanity.h"
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2)
static
void
fail(const char *fmt, ...)
Index: src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
diff -u src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.5 src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.6
--- src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.5 Fri Feb 15 17:07:59 2013
+++ src/external/bsd/atf/dist/atf-c/detail/test_helpers.c Tue Jan 7 02:06:42 2014
@@ -131,8 +131,8 @@ run_h_tc(atf_tc_t *tc, const char *outna
atf_process_child_t child;
atf_process_status_t status;
- RE(atf_fs_path_init_fmt(&outpath, outname));
- RE(atf_fs_path_init_fmt(&errpath, errname));
+ RE(atf_fs_path_init_fmt(&outpath, "%s", outname));
+ RE(atf_fs_path_init_fmt(&errpath, "%s", errname));
struct run_h_tc_data data = { tc, resname };
Index: src/external/bsd/atf/dist/atf-c/detail/tp_main.c
diff -u src/external/bsd/atf/dist/atf-c/detail/tp_main.c:1.1.1.4 src/external/bsd/atf/dist/atf-c/detail/tp_main.c:1.2
--- src/external/bsd/atf/dist/atf-c/detail/tp_main.c:1.1.1.4 Mon Jan 16 22:36:37 2012
+++ src/external/bsd/atf/dist/atf-c/detail/tp_main.c Tue Jan 7 02:06:42 2014
@@ -88,6 +88,7 @@ enum tc_part {
snprintf(buf, buflen, "%s", data->m_what); \
} \
\
+ ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2) \
static \
atf_error_t \
name ## _error(const char *fmt, ...) \
