From ad8809acb29b23fd3fc44e0411e4b430843fb760 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko Date: Thu, 17 Aug 2017 17:13:31 +0300 Subject: [PATCH] odissey: fix jenkins compilation warnings --- CMakeLists.txt | 4 ++-- sources/frontend.c | 2 +- sources/id.c | 6 ++---- sources/logger.c | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31823699..f6c8a6f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,9 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "") set(CMAKE_BUILD_TYPE "Debug") endif() if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -g -O2") + set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -Wstrict-aliasing -g -O2") elseif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -g -O0") + set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -Wstrict-aliasing -g -O0") endif() string(TOLOWER ${CMAKE_BUILD_TYPE} OD_VERSION_BUILD) diff --git a/sources/frontend.c b/sources/frontend.c index c5a1640c..269b18d9 100644 --- a/sources/frontend.c +++ b/sources/frontend.c @@ -187,7 +187,7 @@ error: static inline void od_frontend_key(od_client_t *client) { - client->key.key_pid = *(uint32_t*)client->id.id; + client->key.key_pid = *(int32_t*)client->id.id; client->key.key = 1 + rand(); } diff --git a/sources/id.c b/sources/id.c index e96875a2..8affe9b4 100644 --- a/sources/id.c +++ b/sources/id.c @@ -113,11 +113,9 @@ void od_idmgr_generate(od_idmgr_t *mgr, od_id_t *id, char *prefix) mgr->seed[0] ^= seq ^ second; mgr->seed[1] ^= seq ^ minute; mgr->seed[2] ^= seq ^ (hour + day + month); - mgr->seed[3] ^= ((uint8_t*)&seq)[0] ^ ((uint8_t*)&seq)[1]; - mgr->seed[4] ^= ((uint8_t*)&seq)[2] ^ ((uint8_t*)&seq)[3]; + mgr->seed[3] ^= ((uint8_t*)&seq)[0] ^ ((uint8_t*)&seq)[1] ^ mgr->pid; + mgr->seed[4] ^= ((uint8_t*)&seq)[2] ^ ((uint8_t*)&seq)[3] ^ mgr->uid; mgr->seed[5] ^= seq ^ (uintptr_t)id; - mgr->seed[6] ^= seq ^ (mgr->pid + mgr->uid); - mgr->seed[7] ^= seq; char *dest = id->id; static const char *hex = "0123456789abcdef"; diff --git a/sources/logger.c b/sources/logger.c index dc574122..f20ca347 100644 --- a/sources/logger.c +++ b/sources/logger.c @@ -54,7 +54,7 @@ od_logger_write(od_logger_t *logger, od_logger_ident_t *ident, od_logfile_write(&logger->log, buf, buf_len); od_logsystem(&logger->log_system, ident->syslog_prio, buf, buf_len); if (logger->log_stdout) { - write(0, buf, buf_len); + (void)write(0, buf, buf_len); } }