Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-raid.c

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

File:

• branches/2.2.10/mondo/src/common/libmondo-raid.c (modified) (3 diffs)

branches/2.2.10/mondo/src/common/libmondo-raid.c

@@ -334 +334 @@
 #ifdef __FreeBSD__
     int i, j;
+    char *org = NULL;
 
     fprintf(fout, "\nvolume %s\n", raidrec->volname);
     for (i = 0; i < raidrec->plexes; ++i) {
-        char org[24];
         switch (raidrec->plex[i].raidlevel) {
         case -1:
-            strcpy(org, "concat");
+            mr_asprintf(org, "concat");
             break;
         case 0:
-            strcpy(org, "striped");
+            mr_asprintf(org, "striped");
             break;
         case 5:
-            strcpy(org, "raid5");
+            mr_asprintf(org, "raid5");
             break;
         }
         fprintf(fout, "  plex org %s", org);
+        mr_free(org);
+
         if (raidrec->plex[i].raidlevel != -1) {
             fprintf(fout, " %ik", raidrec->plex[i].stripesize);
@@ -356 +358 @@
 
         for (j = 0; j < raidrec->plex[i].subdisks; ++j) {
-            fprintf(fout, "    sd drive %s size 0\n",
-                    raidrec->plex[i].sd[j].which_device);
+            fprintf(fout, "    sd drive %s size 0\n", raidrec->plex[i].sd[j].which_device);
         }
     }
@@ -501 +502 @@
 
             if (get_option_state(argc, argv, "hotspare")) {
-                strcpy(raidlist->spares.el[raidlist->spares.entries].name,
-                       drivename);
-                strcpy(raidlist->spares.el[raidlist->spares.entries].
-                       device, devname);
+                strcpy(raidlist->spares.el[raidlist->spares.entries].name, drivename);
+                strcpy(raidlist->spares.el[raidlist->spares.entries].  device, devname);
                 raidlist->spares.el[raidlist->spares.entries].index =
                     raidlist->disks.entries;
                 raidlist->spares.entries++;
             } else {
-                strcpy(raidlist->disks.el[raidlist->disks.entries].name,
-                       drivename);
-                strcpy(raidlist->disks.el[raidlist->disks.entries].device,
-                       devname);
+                strcpy(raidlist->disks.el[raidlist->disks.entries].name, drivename);
+                strcpy(raidlist->disks.el[raidlist->disks.entries].device, devname);
                 raidlist->disks.el[raidlist->disks.entries].index =
                     raidlist->disks.entries;