diff options
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/exdata/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | infra/module_manager/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | infra/monitor/monitor_private.h | 4 | ||||
| -rw-r--r-- | infra/monitor/monitor_server.c | 2 | ||||
| -rw-r--r-- | infra/packet_manager/packet_helper.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/infra/exdata/test/CMakeLists.txt b/infra/exdata/test/CMakeLists.txt index 19522b0..8b7b87e 100644 --- a/infra/exdata/test/CMakeLists.txt +++ b/infra/exdata/test/CMakeLists.txt @@ -8,7 +8,6 @@ target_link_libraries( gtest_exdata exdata gtest - gmock ) include(GoogleTest) diff --git a/infra/module_manager/test/CMakeLists.txt b/infra/module_manager/test/CMakeLists.txt index 98be279..e1ab379 100644 --- a/infra/module_manager/test/CMakeLists.txt +++ b/infra/module_manager/test/CMakeLists.txt @@ -11,7 +11,6 @@ target_link_libraries( dl "-rdynamic" gtest - gmock ) include(GoogleTest) diff --git a/infra/monitor/monitor_private.h b/infra/monitor/monitor_private.h index 2e18836..f366d06 100644 --- a/infra/monitor/monitor_private.h +++ b/infra/monitor/monitor_private.h @@ -243,7 +243,7 @@ extern "C" struct timeval time_now; struct stm_stat *stat; struct stm_spinlock *lock; // for dynamic register command, conn_close_cb - int (*gettime_cb)(struct timeval *tv, struct timezone *tz); + int (*gettime_cb)(struct timeval *tv, void *tz); struct monitor_connection current_conn; struct stm_pktdump_runtime *packet_dump; @@ -282,7 +282,7 @@ extern "C" /************************************************************************************************************/ /* monitor call gettimeofday(2) by default */ struct stellar_monitor_config *stellar_monitor_config_new(const char *toml); - int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, struct timezone *tz)); + int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, void *tz)); struct stellar_monitor *stellar_monitor_get(void); struct stm_connection_manager *stm_connection_insert(struct evhttp_connection *evconn); void stm_connection_update(struct stm_connection_manager *conn_mgr, const struct evhttp_connection *evconn); diff --git a/infra/monitor/monitor_server.c b/infra/monitor/monitor_server.c index 35bcea3..cd617d3 100644 --- a/infra/monitor/monitor_server.c +++ b/infra/monitor/monitor_server.c @@ -194,7 +194,7 @@ static void stm_server_set_default_cfg(struct stellar_monitor_config *config) config->output_interval_ms = STM_STAT_OUTPUT_INTERVAL_MS; } -int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, struct timezone *tz)) +int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, void *tz)) { if (NULL == gettime_cb) { diff --git a/infra/packet_manager/packet_helper.h b/infra/packet_manager/packet_helper.h index c14b71f..8d23d1c 100644 --- a/infra/packet_manager/packet_helper.h +++ b/infra/packet_manager/packet_helper.h @@ -405,6 +405,8 @@ static inline uint16_t gre0_hdr_get_offset(const struct gre0_hdr *hdr) } } +#pragma GCC diagnostic warning "-Warray-bounds" + static inline uint32_t gre0_hdr_get_key(const struct gre0_hdr *hdr) { if (gre0_hdr_get_key_flag(hdr)) |