Requested changes for G_strlcat

OSGeo · Sep 18, 2024 · 74b88c4 · 74b88c4
1 parent de760d8
commit 74b88c4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/display/d.mon/list.c b/display/d.mon/list.c
@@ -14,16 +14,10 @@ char *get_path(const char *name, int fpath)
     char tmpdir[GPATH_MAX];
 
     G_temp_element(tmpdir);
-    if (G_strlcat(tmpdir, "/", sizeof(tmpdir)) >= sizeof(tmpdir)) {
-        G_fatal_error(_("Failed to append '/' to path"));
-    }
-    if (G_strlcat(tmpdir, "MONITORS", sizeof(tmpdir)) >= sizeof(tmpdir)) {
-        G_fatal_error(_("Failed to append 'MONITORS' to path"));
-    }
+    (void)G_strlcat(tmpdir, "/", sizeof(tmpdir));
+    (void)G_strlcat(tmpdir, "MONITORS", sizeof(tmpdir));
     if (name) {
-        if (G_strlcat(tmpdir, "/", sizeof(tmpdir)) >= sizeof(tmpdir)) {
-            G_fatal_error(_("Failed to append '/' to path"));
-        }
+        (void)G_strlcat(tmpdir, "/", sizeof(tmpdir));
         if (G_strlcat(tmpdir, name, sizeof(tmpdir)) >= sizeof(tmpdir)) {
             G_fatal_error(_("Failed to append <%s> to path"), name);
         }
@@ -140,16 +134,9 @@ void list_files(const char *name, FILE *fd_out)
     DIR *dirp;
 
     G_temp_element(tmpdir);
-    if (G_strlcat(tmpdir, "/", sizeof(tmpdir)) >= sizeof(tmpdir)) {
-        G_fatal_error(_("Failed to append '/' to path"));
-    }
-    if (G_strlcat(tmpdir, "MONITORS", sizeof(tmpdir)) >= sizeof(tmpdir)) {
-        G_fatal_error(_("Failed to append 'MONITORS' to path"));
-    }
-
-    if (G_strlcat(tmpdir, "/", sizeof(tmpdir)) >= sizeof(tmpdir)) {
-        G_fatal_error(_("Failed to append '/' to path"));
-    }
+    (void)G_strlcat(tmpdir, "/", sizeof(tmpdir));
+    (void)G_strlcat(tmpdir, "MONITORS", sizeof(tmpdir));
+    (void)G_strlcat(tmpdir, "/", sizeof(tmpdir));
 
     if (G_strlcat(tmpdir, name, sizeof(tmpdir)) >= sizeof(tmpdir)) {
         G_fatal_error(_("Failed to append <%s> to path"), name);

diff --git a/display/d.mon/main.c b/display/d.mon/main.c
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
         if (list_flag->answer)
             G_warning(_("Flag -%c ignored"), list_flag->key);
         mon = G_getenv_nofatal("MONITOR");
-        if (mon && strlen(mon) < GNAME_MAX) {
+        if (mon) {
             if (selected_flag->answer) {
                 G_verbose_message(_("Currently selected monitor:"));
                 fprintf(stdout, "%s\n", mon);
@@ -194,12 +194,8 @@ int main(int argc, char *argv[])
                 ret = stop_mon(mon);
             }
         }
-        else if (!mon) {
+        else
             G_important_message(_("No monitor selected"));
-        }
-        else {
-            G_important_message(_("Monitor name is too long"));
-        }
 
         exit(EXIT_SUCCESS);
     }