summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-04-19 22:47:54 +0200
committerGitHub <noreply@github.com>2020-04-19 22:47:54 +0200
commit007d059c1f57b689e0e1501977aecccfaee75c43 (patch)
tree8b1bb7243a91fb96b9d5e45dfe86f5d84ce2fe05
parent38de83ee72a4e39befc021f8be797e91f0c1a422 (diff)
parent416e1e46b5cf3753a0f27fbea6d8a99e960b9be6 (diff)
Merge pull request #12976 from vespa-engine/toregge/ignore-gcc-stringop-truncation-warning-in-vespalog
Ignore gcc stringop-truncation warning in vespalog.
-rw-r--r--vespalog/src/vespa/log/control-file.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/vespalog/src/vespa/log/control-file.cpp b/vespalog/src/vespa/log/control-file.cpp
index 2f070bf088e..aead7c456ef 100644
--- a/vespalog/src/vespa/log/control-file.cpp
+++ b/vespalog/src/vespa/log/control-file.cpp
@@ -264,7 +264,12 @@ ControlFile::getLevels(const char *name)
strcat(appendedString, &padSpaces[3 - padding]);
int prefix_len = strlen(appendedString);
+#pragma GCC diagnostic push
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
strncat(appendedString, inheritLevels, Logger::NUM_LOGLEVELS*sizeof(int));
+#pragma GCC diagnostic pop
strcat(appendedString, "\n");
int len = strlen(appendedString);