Changeset 2205 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-mountlist.c
- Timestamp:
- May 14, 2009, 3:10:51 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/common/libmondo-mountlist.c
r2204 r2205 658 658 asprintf(&drive, "%s", mountlist->el[lino].device); 659 659 if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) { 660 log_msg(8, "Not putting %s in list of drives: it's a virtual drive", 661 660 log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive); 661 paranoid_free(drive); 662 662 continue; 663 663 } … … 665 665 size = mountlist->el[lino].size; 666 666 if (size == 0) { 667 log_msg(8, 668 "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", 669 drive); 667 log_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive); 668 paranoid_free(drive); 670 669 continue; 671 670 } 672 671 673 log_msg(8, "Putting %s with size %lli in list of drives", 674 drive, size); 672 log_msg(8, "Putting %s with size %lli in list of drives", drive, size); 675 673 676 674 (void) truncate_to_drive_name(drive); 677 675 for (j = 0; 678 676 j < noof_drives 679 && strcmp(drivelist->el[j].device, drive) != 0; j++) 677 && strcmp(drivelist->el[j].device, drive) != 0; j++) { 678 paranoid_free(drive); 680 679 continue; 680 } 681 681 if (j == noof_drives) { 682 682 strcpy(drivelist->el[noof_drives++].device, drive); 683 683 } 684 paranoid_free(drive); 684 685 } 685 686 drivelist->entries = noof_drives; … … 816 817 if (res < 5) { 817 818 /* no label found */ 818 asprintf(&(mountlist->el[items].label), "%s", ""); 819 asprintf(&tmp, "%s", ""); 820 mountlist->el[items].label = tmp; 819 821 } 820 822 #elif __FreeBSD__ … … 824 826 mountlist->el[items].mountpoint, 825 827 mountlist->el[items].format, siz); 826 asprintf(&(mountlist->el[items].label), "%s", ""); 828 asprintf(&tmp, "%s", ""); 829 mountlist->el[items].label = tmp; 827 830 #endif 828 831
Note:
See TracChangeset
for help on using the changeset viewer.