Silence gcc7.1 warnings about snprintf().

diff --git a/socket.c b/socket.c
index e3133e289d8f3bf335a4ac30752adebfd665aec6..70fb16953524e0c02e20e5f47cf6b3125174758a 100644 (file)
--- 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 edb3ae03b310af2d27b410a79a5049f200a80535..e1a755651d4c5d198e5ba28927d7db6606dc116a 100644 (file)
--- 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;
 }