Changeset 1171 in MondoRescue

Timestamp:

Feb 15, 2007, 10:51:21 AM (18 years ago)

Author:

Bruno Cornec

Message:

asprintf => mr_asprintf + getline => mr_getline

Location:

branches/stable/mondo/src/common

Files:

• libmondo-raid.c (modified) (5 diffs)
• newt-specific.c (modified) (1 diff)

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

@@ -999 +999 @@
   row = 1;
   // skip first output row - contains registered RAID levels
-  res = getline(&string, &len, fin);
+  res = mr_getline(&string, &len, fin);
   // parse the rest
   while ( !feof_unlocked(fin) ) {
-    res = getline(&string, &len, fin);
+    res = mr_getline(&string, &len, fin);
     if (res <= 0) break;
     // trim leading spaces
     pos = string;
     while (*pos == ' ') pos += 1;
-    asprintf(&strtmp, pos);
+    mr_asprintf(&strtmp, pos);
     strcpy(string, strtmp);
     mr_free(strtmp);
@@ -1028 +1028 @@
     token = mr_strtok (string, delims, &lastpos);
     // get RAID device name
-    asprintf(&strtmp,"%s%s", device_prefix, token);
+    mr_asprintf(&strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
     mr_free(strtmp);
@@ -1087 +1087 @@
       case ' ': // normal data disks
         raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
         mr_free(strtmp);
@@ -1094 +1094 @@
       case 'S': // spare disks
         raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
         mr_free(strtmp);
@@ -1101 +1101 @@
       case 'F': // failed disks
         raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
         mr_free(strtmp);

branches/stable/mondo/src/common/newt-specific.c

@@ -260 +260 @@
 char *tmp = NULL;
 
-asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -vx \"\\?\"`", ps_options, str , ps_proc_id);
+mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -vx \"\\?\"`", ps_options, str , ps_proc_id);
 run_program_and_log_output(tmp, TRUE);
 mr_free(tmp);