Changeset 2323 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-raid.c
- Timestamp:
- Aug 18, 2009, 3:05:43 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-raid.c
r2321 r2323 50 50 int res; 51 51 52 mr_asprintf( &command, "grep \"");52 mr_asprintf(command, "grep \""); 53 53 if (raidno == -1) { 54 54 mr_strcat(command, "linear"); … … 197 197 assert(label != NULL); 198 198 199 mr_asprintf( &sz_value, "%d", value);199 mr_asprintf(sz_value, "%d", value); 200 200 strcpy(raidrec->additional_vars.el[lino].label, label); 201 201 strcpy(raidrec->additional_vars.el[lino].value, sz_value); … … 585 585 fclose(fin); 586 586 log_it("Raidtab loaded successfully."); 587 mr_asprintf( &tmp1, "%d RAID devices in raidtab", raidlist->entries);587 mr_asprintf(tmp1, "%d RAID devices in raidtab", raidlist->entries); 588 588 log_it(tmp1); 589 589 mr_free(tmp1); … … 744 744 } 745 745 if (!disklist) { 746 mr_asprintf( &tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);746 mr_asprintf(tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label); 747 747 log_it(tmp); 748 748 mr_free(tmp); … … 1006 1006 pos = string; 1007 1007 while (*pos == ' ') pos += 1; 1008 mr_asprintf( &strtmp, "%s", pos);1008 mr_asprintf(strtmp, "%s", pos); 1009 1009 strcpy(string, strtmp); 1010 1010 paranoid_free(strtmp); … … 1027 1027 token = mr_strtok(string, delims, &lastpos); 1028 1028 // get RAID device name 1029 mr_asprintf( &strtmp,"%s%s", device_prefix, token);1029 mr_asprintf(strtmp,"%s%s", device_prefix, token); 1030 1030 strcpy(raidlist->el[raidlist->entries].raid_device, strtmp); 1031 1031 paranoid_free(strtmp); … … 1086 1086 case ' ': // normal data disks 1087 1087 raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1); 1088 mr_asprintf( &strtmp,"%s%s", device_prefix, token);1088 mr_asprintf(strtmp,"%s%s", device_prefix, token); 1089 1089 strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp); 1090 1090 paranoid_free(strtmp); … … 1093 1093 case 'S': // spare disks 1094 1094 raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1); 1095 mr_asprintf( &strtmp,"%s%s", device_prefix, token);1095 mr_asprintf(strtmp,"%s%s", device_prefix, token); 1096 1096 strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp); 1097 1097 paranoid_free(strtmp); … … 1100 1100 case 'F': // failed disks 1101 1101 raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1); 1102 mr_asprintf( &strtmp,"%s%s", device_prefix, token);1102 mr_asprintf(strtmp,"%s%s", device_prefix, token); 1103 1103 strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp); 1104 1104 paranoid_free(strtmp);
Note:
See TracChangeset
for help on using the changeset viewer.