1b80a03560
- Update to version 8.6.7 - No short release notes available - Added issue-1417243-Fix-gcc8-build-warnings.patch to fix compilation issue with GCC8 OBS-URL: https://build.opensuse.org/request/show/618880 OBS-URL: https://build.opensuse.org/package/show/science:HPC/libvma?expand=0&rev=8
91 lines
3.5 KiB
Diff
91 lines
3.5 KiB
Diff
commit 6038444046736c9c63839ec83d083f6aec67be59
|
|
Author: Liran Oz <lirano@mellanox.com>
|
|
Date: Sun Jun 10 11:24:40 2018 +0300
|
|
|
|
issue: 1417243 Fix gcc8 build warnings
|
|
|
|
Signed-off-by: Sergey Lykov <sergeyly@mellanox.com>
|
|
Signed-off-by: Liran Oz <lirano@mellanox.com>
|
|
|
|
diff --git src/vma/dev/buffer_pool.cpp src/vma/dev/buffer_pool.cpp
|
|
index 233d3ca9b67f..794f05c056b0 100644
|
|
--- src/vma/dev/buffer_pool.cpp
|
|
+++ src/vma/dev/buffer_pool.cpp
|
|
@@ -108,9 +108,7 @@ buffer_pool::buffer_pool(size_t buffer_count, size_t buf_size, ib_ctx_handler *p
|
|
|
|
// Split the block to buffers
|
|
for (size_t i = 0; i < buffer_count; ++i) {
|
|
-
|
|
- mem_buf_desc_t* ptr_desc_mbdt = (mem_buf_desc_t*)ptr_desc;
|
|
- memset(ptr_desc_mbdt, 0, sizeof (*ptr_desc_mbdt));
|
|
+ memset(ptr_desc, 0, sizeof(mem_buf_desc_t));
|
|
mem_buf_desc_t *desc = new (ptr_desc) mem_buf_desc_t(ptr_buff, buf_size);
|
|
desc->p_desc_owner = owner;
|
|
desc->lwip_pbuf.custom_free_function = custom_free_function;
|
|
diff --git src/vma/infra/subject_observer.cpp src/vma/infra/subject_observer.cpp
|
|
index 4448c801cae9..915b7802fdab 100644
|
|
--- src/vma/infra/subject_observer.cpp
|
|
+++ src/vma/infra/subject_observer.cpp
|
|
@@ -52,11 +52,11 @@ bool subject::register_observer(IN const observer* const new_observer)
|
|
}
|
|
|
|
auto_unlocker lock(m_lock);
|
|
- if (m_observers.count((observer * const)new_observer) > 0) {
|
|
+ if (m_observers.count((observer *)new_observer) > 0) {
|
|
// sub_obs_logdbg("[%s] Observer is already registered (%p)", to_str(), new_observer);
|
|
return false;
|
|
}
|
|
- m_observers.insert((observer * const)new_observer);
|
|
+ m_observers.insert((observer *)new_observer);
|
|
// sub_obs_logdbg("[%s] Successfully registered new_observer %s", to_str(), new_observer->to_str());
|
|
return true;
|
|
}
|
|
@@ -69,7 +69,7 @@ bool subject::unregister_observer(IN const observer * const old_observer)
|
|
}
|
|
|
|
auto_unlocker lock(m_lock);
|
|
- m_observers.erase((observer * const)old_observer);
|
|
+ m_observers.erase((observer *)old_observer);
|
|
// sub_obs_logdbg("[%s] Successfully unregistered old_observer %s",to_str(), old_observer->to_str());
|
|
return true;
|
|
}
|
|
diff --git src/vma/proto/L2_address.h src/vma/proto/L2_address.h
|
|
index 8baf61e635a0..997894afb189 100644
|
|
--- src/vma/proto/L2_address.h
|
|
+++ src/vma/proto/L2_address.h
|
|
@@ -59,7 +59,7 @@ public:
|
|
void set(address_t const address, addrlen_t const len);
|
|
|
|
addrlen_t get_addrlen() const { return m_len; };
|
|
- address_t get_address() const { return (const address_t)m_p_raw_address; };
|
|
+ address_t get_address() const { return (address_t)m_p_raw_address; };
|
|
|
|
virtual bool compare(L2_address const& other) const;
|
|
|
|
diff --git src/vma/proto/route_table_mgr.cpp src/vma/proto/route_table_mgr.cpp
|
|
index 235cb1fdb6b6..83c61fe99379 100644
|
|
--- src/vma/proto/route_table_mgr.cpp
|
|
+++ src/vma/proto/route_table_mgr.cpp
|
|
@@ -378,7 +378,6 @@ bool route_table_mgr::route_resolve(IN route_rule_table_key key, OUT route_resul
|
|
}
|
|
}
|
|
/* prevent usage on false return */
|
|
- memset(&res, 0, sizeof(route_result));
|
|
return false;
|
|
}
|
|
|
|
diff --git tools/daemon/daemon.h tools/daemon/daemon.h
|
|
index 6a8804eea59d..7744d3b38d6c 100644
|
|
--- tools/daemon/daemon.h
|
|
+++ tools/daemon/daemon.h
|
|
@@ -204,8 +204,8 @@ static inline void sys_log(int level, const char *format, ...)
|
|
|
|
static inline char *sys_addr2str(struct sockaddr_in *addr)
|
|
{
|
|
- static __thread char addrbuf[100];
|
|
static char buf[100];
|
|
+ static __thread char addrbuf[sizeof(buf) + sizeof(addr->sin_port) + 5];
|
|
inet_ntop(AF_INET, &addr->sin_addr, buf, sizeof(buf) - 1);
|
|
sprintf(addrbuf, "%s:%d", buf, ntohs(addr->sin_port));
|
|
|