From eb80105ea855f2c7ee0ea467574acf86cf455a77 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Wed, 5 Dec 2012 14:42:21 +0100 Subject: [PATCH] Fix compiler warnings on OpenBSD. --- src/logger.c | 3 ++- src/net_packet.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/logger.c b/src/logger.c index 6e3d2c01..e01980e9 100644 --- a/src/logger.c +++ b/src/logger.c @@ -59,7 +59,8 @@ static void real_logger(int level, int priority, const char *message) { case LOGMODE_FILE: if(!now.tv_sec) gettimeofday(&now, NULL); - strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now.tv_sec)); + time_t now_sec = now.tv_sec; + strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now_sec)); fprintf(logfile, "%s %s[%ld]: %s\n", timestr, logident, (long)logpid, message); fflush(logfile); break; diff --git a/src/net_packet.c b/src/net_packet.c index 81ca70a4..3c3397cd 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -739,11 +739,11 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t int offset = (type & PKT_MAC) ? 0 : 14; if(type & PKT_COMPRESSED) { - len = uncompress_packet(inpkt.data + offset, (const uint8_t *)data, len, from->incompression); - if(len < 0) { + length_t ulen = uncompress_packet(inpkt.data + offset, (const uint8_t *)data, len, from->incompression); + if(ulen < 0) { return false; } else { - inpkt.len = len + offset; + inpkt.len = ulen + offset; } if(inpkt.len > MAXSIZE) abort(); -- 2.20.1