From f5446552f318c01097e1b56449e4427c4e1dfa6e Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 29 May 2020 14:18:08 -0700 Subject: [PATCH] Silence gcc7.1 warnings about snprintf(). --- socket.c | 5 ++--- util.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/socket.c b/socket.c index e3133e28..70fb1695 100644 --- a/socket.c +++ b/socket.c @@ -73,9 +73,8 @@ static int establish_proxy_connection(int fd, char *host, int port, authhdr = ""; } - snprintf(buffer, sizeof buffer, "CONNECT %s:%d HTTP/1.0%s%s\r\n\r\n", - host, port, authhdr, authbuf); - len = strlen(buffer); + len = snprintf(buffer, sizeof buffer, "CONNECT %s:%d HTTP/1.0%s%s\r\n\r\n", host, port, authhdr, authbuf); + assert(len > 0 && len < (int)sizeof buffer); if (write(fd, buffer, len) != len) { rsyserr(FERROR, errno, "failed to write to proxy"); return -1; diff --git a/util.c b/util.c index edb3ae03..e1a75565 100644 --- a/util.c +++ b/util.c @@ -1342,10 +1342,10 @@ char *timestring(time_t t) static char buffers[4][20]; /* We support 4 simultaneous timestring results. */ char *TimeBuf = buffers[ndx = (ndx + 1) % 4]; struct tm *tm = localtime(&t); - - snprintf(TimeBuf, sizeof buffers[0], "%4d/%02d/%02d %02d:%02d:%02d", + int len = snprintf(TimeBuf, sizeof buffers[0], "%4d/%02d/%02d %02d:%02d:%02d", (int)tm->tm_year + 1900, (int)tm->tm_mon + 1, (int)tm->tm_mday, (int)tm->tm_hour, (int)tm->tm_min, (int)tm->tm_sec); + assert(len > 0); /* Silence gcc warning */ return TimeBuf; }