1From f82f8faf9942f51e9c3c773b56574652695bef5a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 May 2018 21:45:38 -0700
4Subject: [PATCH] Disable new gcc8 warnings
5
6GCC seems to be not able to detect the checks for size are
7already in place
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12 src/libcollectdclient/network_parse.c | 7 +++++++
13 src/write_sensu.c                     | 7 +++++++
14 2 files changed, 14 insertions(+)
15
16diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c
17index aa753ce..fef43a9 100644
18--- a/src/libcollectdclient/network_parse.c
19+++ b/src/libcollectdclient/network_parse.c
20@@ -148,6 +148,11 @@ static int parse_int(void *payload, size_t payload_size, uint64_t *out) {
21   return 0;
22 }
23
24+#pragma GCC diagnostic push
25+#if __GNUC__ == 8
26+#pragma GCC diagnostic ignored "-Wstringop-truncation"
27+#endif
28+
29 static int parse_string(void *payload, size_t payload_size, char *out,
30                         size_t out_size) {
31   char *in = payload;
32@@ -160,6 +165,8 @@ static int parse_string(void *payload, size_t payload_size, char *out,
33   return 0;
34 }
35
36+#pragma GCC diagnostic pop
37+
38 static int parse_identifier(uint16_t type, void *payload, size_t payload_size,
39                             lcc_value_list_t *state) {
40   char buf[LCC_NAME_LEN];
41diff --git a/src/write_sensu.c b/src/write_sensu.c
42index bd7a56d..6cb59d5 100644
43--- a/src/write_sensu.c
44+++ b/src/write_sensu.c
45@@ -570,6 +570,11 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
46   return ret_str;
47 } /* }}} char *sensu_value_to_json */
48
49+#pragma GCC diagnostic push
50+#if __GNUC__ > 7
51+#pragma GCC diagnostic ignored "-Wstringop-overflow"
52+#pragma GCC diagnostic ignored "-Wstringop-truncation"
53+#endif
54 /*
55  * Uses replace_str2() implementation from
56  * http://creativeandcritical.net/str-replace-c/
57@@ -632,6 +637,8 @@ static char *replace_str(const char *str, const char *old, /* {{{ */
58   return ret;
59 } /* }}} char *replace_str */
60
61+#pragma GCC diagnostic pop
62+
63 static char *replace_json_reserved(const char *message) /* {{{ */
64 {
65   char *msg = replace_str(message, "\\", "\\\\");
66