diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-12 22:22:50 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-12 22:22:50 +0200 |
commit | 6152d7e8ddd0f7e5009674c25e3f8fcdaade784b (patch) | |
tree | 8471614028f3eab91a34257f76777593bbc283bc /vespalog/src | |
parent | e7c01afea43e4ce2592f99a9cccb62cfb355704c (diff) |
Add -Wformat-security
Diffstat (limited to 'vespalog/src')
-rw-r--r-- | vespalog/src/test/bufferedlogtest.cpp | 5 | ||||
-rw-r--r-- | vespalog/src/test/bufferedlogtest.logger1.cpp | 4 | ||||
-rw-r--r-- | vespalog/src/test/bufferedlogtest.logger1.h | 2 | ||||
-rw-r--r-- | vespalog/src/test/bufferedlogtest.logger2.cpp | 4 | ||||
-rw-r--r-- | vespalog/src/test/bufferedlogtest.logger2.h | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/vespalog/src/test/bufferedlogtest.cpp b/vespalog/src/test/bufferedlogtest.cpp index 3e974057361..9b69d9d3a14 100644 --- a/vespalog/src/test/bufferedlogtest.cpp +++ b/vespalog/src/test/bufferedlogtest.cpp @@ -71,12 +71,11 @@ void spamLog2(uint64_t& time, int diff) { time += diff; std::ostringstream ost; ost << "Message " << i; - LOGBT(info, ost.str(), ost.str().c_str()); + LOGBT(info, ost.str(), "%s", ost.str().c_str()); } } -void testThatEntriesWithHighCountIsKept(const std::string& file, - uint64_t& timer) +void testThatEntriesWithHighCountIsKept(const std::string& file, uint64_t& timer) { std::cerr << "testThatEntriesWithHighCountIsKept ...\n"; timer = 10 * 1000000 + 4; diff --git a/vespalog/src/test/bufferedlogtest.logger1.cpp b/vespalog/src/test/bufferedlogtest.logger1.cpp index 24b9237a71d..dde5f2edbb5 100644 --- a/vespalog/src/test/bufferedlogtest.logger1.cpp +++ b/vespalog/src/test/bufferedlogtest.logger1.cpp @@ -5,7 +5,7 @@ LOG_SETUP(".logger1"); -void logWithLogger1(const std::string& token, const std::string message) +void logWithLogger1(const std::string& token, const std::string & message) { - LOGBT(info, token, message.c_str()); + LOGBT(info, token, "%s", message.c_str()); } diff --git a/vespalog/src/test/bufferedlogtest.logger1.h b/vespalog/src/test/bufferedlogtest.logger1.h index acbd67e8c3e..1ec8f9acad4 100644 --- a/vespalog/src/test/bufferedlogtest.logger1.h +++ b/vespalog/src/test/bufferedlogtest.logger1.h @@ -4,5 +4,5 @@ #include <string> -void logWithLogger1(const std::string& token, const std::string message); +void logWithLogger1(const std::string& token, const std::string & message); diff --git a/vespalog/src/test/bufferedlogtest.logger2.cpp b/vespalog/src/test/bufferedlogtest.logger2.cpp index 8d6ca97130e..992eeb70481 100644 --- a/vespalog/src/test/bufferedlogtest.logger2.cpp +++ b/vespalog/src/test/bufferedlogtest.logger2.cpp @@ -5,7 +5,7 @@ LOG_SETUP(".logger2"); -void logWithLogger2(const std::string& token, const std::string message) +void logWithLogger2(const std::string& token, const std::string & message) { - LOGBT(info, token, message.c_str()); + LOGBT(info, token, "%s", message.c_str()); } diff --git a/vespalog/src/test/bufferedlogtest.logger2.h b/vespalog/src/test/bufferedlogtest.logger2.h index 398d799a2b3..cd88d8ea0be 100644 --- a/vespalog/src/test/bufferedlogtest.logger2.h +++ b/vespalog/src/test/bufferedlogtest.logger2.h @@ -4,5 +4,5 @@ #include <string> -void logWithLogger2(const std::string& token, const std::string message); +void logWithLogger2(const std::string& token, const std::string & message); |