summaryrefslogtreecommitdiffstats
path: root/VNFs
diff options
context:
space:
mode:
authorXavier Simonart <xavier.simonart@intel.com>2019-10-08 17:54:22 -0400
committerXavier Simonart <xavier.simonart@intel.com>2019-10-08 17:54:22 -0400
commit67560734daab81c050a13d3b435d7eca4442c199 (patch)
tree212b479dc70c32755d05a25c3d5c087183aad27a /VNFs
parentca79a59426e4c462d786e602427cf9c29450d2b0 (diff)
Fix compatibility with GCC 6 and earlier
fb0c44a fixed compilation on GCC 8 by using: 1) #pragma GCC diagnostic ignored "-Wstringop-truncation" 2) __attribute__ ((fallthrough)); However, -Wstringop-truncation has only been introduced in GCC 8 and __attribute__ ((fallthrough)) has only been introduced in GCC 7. Hence they caused Warnings/Errors on earlier versions. Comments about fallthough (see https://developers.redhat.com/blog/2017/03/10/wimplicit-fallthrough-in-gcc-7/) can be used on GCC 8 to prevent fall through warnings Signed-off-by: Xavier Simonart <xavier.simonart@intel.com> Change-Id: I6f22e023191bbf22d8b01f1812061795a6494134
Diffstat (limited to 'VNFs')
-rw-r--r--VNFs/DPPD-PROX/handle_acl.c2
-rw-r--r--VNFs/DPPD-PROX/parse_utils.c4
-rw-r--r--VNFs/DPPD-PROX/prox_compat.h1
3 files changed, 4 insertions, 3 deletions
diff --git a/VNFs/DPPD-PROX/handle_acl.c b/VNFs/DPPD-PROX/handle_acl.c
index c0a1b86b..5138eef9 100644
--- a/VNFs/DPPD-PROX/handle_acl.c
+++ b/VNFs/DPPD-PROX/handle_acl.c
@@ -108,7 +108,7 @@ static int handle_acl_bulk(struct task_base *tbase, struct rte_mbuf **mbufs, uin
break;
case ACL_ALLOW:
out[i] = 0;
- __attribute__ ((fallthrough));
+ // __attribute__ ((fallthrough));
case ACL_RATE_LIMIT:
set_tc(mbufs[i], 3);
break;
diff --git a/VNFs/DPPD-PROX/parse_utils.c b/VNFs/DPPD-PROX/parse_utils.c
index 84ff8cc9..af98ec2b 100644
--- a/VNFs/DPPD-PROX/parse_utils.c
+++ b/VNFs/DPPD-PROX/parse_utils.c
@@ -923,12 +923,12 @@ int parse_kmg(uint32_t* val, const char *str2)
if (*val >> 22)
return -2;
*val <<= 10;
- __attribute__ ((fallthrough));
+ // __attribute__ ((fallthrough));
case 'M':
if (*val >> 22)
return -2;
*val <<= 10;
- __attribute__ ((fallthrough));
+ // __attribute__ ((fallthrough));
case 'K':
if (*val >> 22)
return -2;
diff --git a/VNFs/DPPD-PROX/prox_compat.h b/VNFs/DPPD-PROX/prox_compat.h
index 7564f294..e1ead1d3 100644
--- a/VNFs/DPPD-PROX/prox_compat.h
+++ b/VNFs/DPPD-PROX/prox_compat.h
@@ -133,6 +133,7 @@ static void *prox_rte_table_create(struct prox_rte_table_params *params, int soc
static inline char *prox_strncpy(char * dest, const char * src, size_t count)
{
#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wstringop-truncation"
strncpy(dest, src, count);
#pragma GCC diagnostic pop