Changeset 3856 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Mar 6, 2024, 5:29:44 PM (3 months ago)

Author:

Bruno Cornec

Message:

remove snprintf usage and use bkpinfo for serial_string

File:

• branches/3.3/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

branches/3.3/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1436 +1436 @@
     for (;;) {
         int i;
-        char headerstr[MAX_STR_LEN];
-        snprintf(headerstr, MAX_STR_LEN, "%-14s %-8s  %11s  %8s",
-                 "Plex", "Level", "Stripe Size", "Subdisks");
+        char *headerstr = NULL;
+        mr_asprintf(headerstr, "%-14s %-8s  %11s  %8s", "Plex", "Level", "Stripe Size", "Subdisks");
 
         bOK = newtCompactButton(2, 13, "  OK  ");
@@ -1449 +1448 @@
             newtListbox(2, 3, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
         plexesHeader = newtLabel(2, 2, headerstr);
+        mr_free(headerstr);
         editraidForm = newtForm(NULL, NULL, 0);
 
@@ -1455 +1455 @@
             keylist[i] = (void *) i;
             if (i < raidrec->plexes) {
-                char pname[64], entry[MAX_STR_LEN];
+                char *pname;
+                char *entry;
                 switch (raidrec->plex[i].raidlevel) {
                 case -1:
@@ -1476 +1477 @@
                     mr_asprintf(chunksize, "%dk", raidrec->plex[i].stripesize);
                 }
-                snprintf(pname, 64, "%s.p%i", raidrec->volname, i);
-                snprintf(entry, MAX_STR_LEN, "%-14s %-8s  %11s  %8d",
-                         pname, raidlevel, chunksize,
-                         raidrec->plex[i].subdisks);
+                mr_asprintf(pname, "%s.p%i", raidrec->volname, i);
+                mr_asprintf(entry, "%-14s %-8s  %11s  %8d", pname, raidlevel, chunksize, raidrec->plex[i].subdisks);
+                mr_free(pname);
                 mr_free(raidlevel);
                 mr_free(chunksize);
 
                 newtListboxAppendEntry(plexesListbox, entry, keylist[i]);
+                mr_free(entry);
             }
         }