From 13ced4c1eb0dccf434aa0fde44994c0dbfbca1f9 Mon Sep 17 00:00:00 2001
From: Liran Oz <lirano@mellanox.com>
Date: Sun, 10 Feb 2019 09:58:52 +0000
Subject: [PATCH 2/2] issue: 1679157 Fix gcc8 build warnings

Signed-off-by: Liran Oz <lirano@mellanox.com>
---
 src/message.cpp  | 2 +-
 src/sockperf.cpp | 2 +-
 src/switches.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/message.cpp b/src/message.cpp
index 8973decec4..5994311b02 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -93,7 +93,7 @@ Message::Message() {
 
     for (int len = 0; len < ms_maxSize; len++)
         m_addr[len] = (uint8_t)rand();
-    memset(m_header, 0, MsgHeader::EFFECTIVE_SIZE);
+    memset((void *)m_header, 0, MsgHeader::EFFECTIVE_SIZE);
 
     /*
         log_msg("ms_maxSize=%d, m_buf=%p, alignment=%d, m_data=%p, m_header=%p", ms_maxSize, m_buf,
diff --git a/src/sockperf.cpp b/src/sockperf.cpp
index 60242201b5..1f1953cb7f 100644
--- a/src/sockperf.cpp
+++ b/src/sockperf.cpp
@@ -2156,7 +2156,7 @@ void set_defaults() {
     int igmp_max_memberships = read_int_from_sys_file("/proc/sys/net/ipv4/igmp_max_memberships");
     if (igmp_max_memberships != -1) IGMP_MAX_MEMBERSHIPS = igmp_max_memberships;
 
-    memset(&s_user_params, 0, sizeof(struct user_params_t));
+    memset((void *)&s_user_params, 0, sizeof(s_user_params));
     memset(g_fds_array, 0, sizeof(fds_data *) * MAX_FDS_NUM);
     s_user_params.rx_mc_if_addr.s_addr = htonl(INADDR_ANY);
     s_user_params.tx_mc_if_addr.s_addr = htonl(INADDR_ANY);
diff --git a/src/switches.h b/src/switches.h
index d70fadf485..31a5e1f3da 100644
--- a/src/switches.h
+++ b/src/switches.h
@@ -285,7 +285,7 @@ private:
             if (!drops_num)
                 seq_num_map_itr->second.seq_num--;
             else {
-                char drops_num_str[10];
+                char drops_num_str[30];
                 char seq_num_info_str[50];
                 char ip_port_str[30];
                 sprintf(ip_port_str, "[%s:%d]", inet_ntoa(seq_num_map_itr->second.addr.sin_addr),
-- 
2.23.0