summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Gow <davidgow@google.com>2021-05-13 13:03:50 -0700
committerShuah Khan <skhan@linuxfoundation.org>2021-06-23 17:06:04 -0600
commit44acdbb250a57240ec113f12bd6229854681ea5f (patch)
tree63db8f2396302ed07607692114a51dd4c3c08594
parent255ede3b129041eae4edfdce121cedbfabfdd30e (diff)
downloadlinux-44acdbb250a57240ec113f12bd6229854681ea5f.tar.bz2
kunit: Add gnu_printf specifiers
Some KUnit functions use variable arguments to implement a printf-like format string. Use the __printf() attribute to let the compiler warn if invalid format strings are passed in. If the kernel is build with W=1, it complained about the lack of these specifiers, e.g.: ../lib/kunit/test.c:72:2: warning: function ‘kunit_log_append’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] Signed-off-by: David Gow <davidgow@google.com> Reviewed-by: Daniel Latypov <dlatypov@google.com> Acked-by: Brendan Higgins <brendanhiggins@google.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
-rw-r--r--include/kunit/test.h2
-rw-r--r--lib/kunit/string-stream.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/kunit/test.h b/include/kunit/test.h
index b68c61348121..512bfb5fe24f 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -610,7 +610,7 @@ static inline void *kunit_kzalloc(struct kunit *test, size_t size, gfp_t gfp)
void kunit_cleanup(struct kunit *test);
-void kunit_log_append(char *log, const char *fmt, ...);
+void __printf(2, 3) kunit_log_append(char *log, const char *fmt, ...);
/*
* printk and log to per-test or per-suite log buffer. Logging only done
diff --git a/lib/kunit/string-stream.h b/lib/kunit/string-stream.h
index fe98a00b75a9..5e94b623454f 100644
--- a/lib/kunit/string-stream.h
+++ b/lib/kunit/string-stream.h
@@ -35,9 +35,9 @@ struct string_stream *alloc_string_stream(struct kunit *test, gfp_t gfp);
int __printf(2, 3) string_stream_add(struct string_stream *stream,
const char *fmt, ...);
-int string_stream_vadd(struct string_stream *stream,
- const char *fmt,
- va_list args);
+int __printf(2, 0) string_stream_vadd(struct string_stream *stream,
+ const char *fmt,
+ va_list args);
char *string_stream_get_string(struct string_stream *stream);