Changeset 552

Timestamp:

Oct 31, 2019, 10:56:53 PM (5 years ago)

Author:

katerina

Message:

Fix gcc 9.2.1 (Ubuntu 19.10) compiler warnings.

Location:

trunk

Files:

• include/sh_utils.h (modified) (1 diff)
• src/sh_static.c (modified) (3 diffs)
• src/slib.c (modified) (1 diff)

trunk/include/sh_utils.h

@@ -179 +179 @@
 /* returns freshly allocated memory, return value should be free'd
  */
-char * sh_util_safe_name (const char * name) SH_GNUC_MALLOC SH_GNUC_PURE;
-
-char * sh_util_safe_name_keepspace (const char * name) SH_GNUC_MALLOC SH_GNUC_PURE;
+char * sh_util_safe_name (const char * name) SH_GNUC_MALLOC;
+
+char * sh_util_safe_name_keepspace (const char * name) SH_GNUC_MALLOC;
 
 /* check max size of printf result string

trunk/src/sh_static.c

@@ -1765 +1765 @@
         if (buflen<256)
                 return ERANGE;
-        strncpy(buf, name, buflen);
+        strncpy(buf, name, buflen-1);
 
         /* First check if this is already an address */
@@ -1792 +1792 @@
                 }
 
-                strncpy(buf, a.dotted, buflen);
+                strncpy(buf, a.dotted, buflen-1);
                 free(a.dotted);
 
@@ -2013 +2013 @@
                 }
 
-                strncpy(buf, a.dotted, buflen);
+                strncpy(buf, a.dotted, buflen-1);
                 free(a.dotted);
 

trunk/src/slib.c

@@ -257 +257 @@
     {
       sl_snprintf    (val, 81, _("\n---------  %10s "), file);
-      sl_strlcpy     (msg,    val,   80);
+      sl_strlcpy     (msg,    val,   sizeof(msg));
       sl_snprintf    (val, 81, _(" --- %6d ---------\n"), line);
-      sl_strlcat     (msg,     val,   80);
+      sl_strlcat     (msg,     val,   sizeof(msg));
       sh_log_console (msg);
     }