Changeset 1176 in MondoRescue for trunk/mondo/src/common/libmondo-raid.c

Timestamp:

Feb 16, 2007, 2:16:14 PM (17 years ago)

Author:

Bruno Cornec

Message:

Some merges from stable (synchro for mem. mngt)

File:

• trunk/mondo/src/common/libmondo-raid.c (modified) (15 diffs)

trunk/mondo/src/common/libmondo-raid.c

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_str.h"
+#include "mr_mem.h"
+#include "mr_msg.h"
+
 #include "mondostructures.h"
 #include "newt-specific-EXT.h"
@@ -16 +19 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-raid.h"
-#include "mr_mem.h"
-#include "mr_str.h"
-#include "mr_mem.h"
 
 #ifdef __FreeBSD__
@@ -47 +47 @@
 #else
     /*@ buffer ********************************************************** */
-    char *command;
-    int res;
+    char *command = NULL;
+    int res = 0;
 
     if (raidno == -1) {
@@ -228 +228 @@
 #endif
 
+
 /**
  * Save the additional RAID variables to a stream.
@@ -316 +317 @@
 #ifdef __FreeBSD__
     int i, j;
+    char *org = NULL;
 
     fprintf(fout, "\nvolume %s\n", raidrec->volname);
     for (i = 0; i < raidrec->plexes; ++i) {
-        char *org;
         switch (raidrec->plex[i].raidlevel) {
         case -1:
-            mr_asprintf(&org, "%s", "concat");
+            mr_asprintf(&org, "concat");
             break;
         case 0:
-            mr_asprintf(&org, "%s", "striped");
+            mr_asprintf(&org, "striped");
             break;
         case 5:
-            mr_asprintf(&org, "%s", "raid5");
+            mr_asprintf(&org, "raid5");
             break;
         }
@@ -422 +423 @@
     for (mr_getline(&incoming, &n, fin); !feof(fin);
          mr_getline(&incoming, &n, fin)) {
-        strip_spaces(incoming);
+        mr_strip_spaces(incoming);
         p = strchr(incoming, ' ');
         if (strlen(incoming) < 3 || incoming[0] == '#' || !p) {
@@ -450 +451 @@
                                char *fname)
 {
-    FILE *fin;
-    char *tmp1;
-    int items;
+    FILE *fin = NULL;
+    int items = 0;
 
     raidlist->spares.entries = 0;
@@ -499 +499 @@
             }
         } else if (!strcmp(argv[0], "volume")) {
-            char *volname;
+            char *volname = NULL;
             if (argc < 2)
                 continue;
@@ -508 +508 @@
         } else if (!strcmp(argv[0], "plex")) {
             int raidlevel, stripesize;
-            char *org = 0;
-            char **tmp = 0;
+            char *org = NULL;
+            char **tmp = NULL;
             if (argc < 3)
                 continue;
@@ -546 +546 @@
         } else if ((!strcmp(argv[0], "sd"))
                    || (!strcmp(argv[0], "subdisk"))) {
-            char *drive = 0;
+            char *drive = NULL;
             if (argc < 3)
                 continue;
@@ -565 +565 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    mr_asprintf(&tmp1, "%d RAID devices in raidtab", raidlist->entries);
-    log_it(tmp1);
-    mr_free(tmp1);
+    log_it("%d RAID devices in raidtab", raidlist->entries);
     return (0);
 }
@@ -647 +645 @@
 
     /*@ add mallocs * */
-    char *tmp = NULL;
     char *labelB = NULL;
     char *valueB = NULL;
@@ -701 +698 @@
         }
         if (!disklist) {
-            mr_asprintf(&tmp,
-                     "Ignoring '%s %s' pair of disk %s", labelB, valueB,
-                     label);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Ignoring '%s %s' pair of disk %s", labelB, valueB,
+                    label);
         } else {
             add_disk_to_raid_device(disklist, value, atoi(valueB));
@@ -932 +926 @@
   const char delims[] = " ";
 
-  FILE   *fin;
-  int    row, i, index_min;
+  FILE *fin = NULL;
+  int row = 0;
+  int i = 0;
+  int index_min = 0;
   int lastpos = 0;
   size_t len = 0;
-  char   *token;
+  char *token = NULL;
   char *string = NULL;
-  char *pos;
-  char type;
-  char *strtmp;
+  char *pos = NULL;
+  char type = NULL;
+  char *strtmp = NULL;
 
   // open file
@@ -982 +978 @@
     mr_asprintf(&strtmp,"%s%s", device_prefix, token);
     raidlist->el[raidlist->entries].raid_device = strtmp;
+    mr_free(strtmp);
     mr_free(token);
     // skip ':' and status