Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-verify.c
- Timestamp:
- Aug 18, 2009, 3:13:54 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-verify.c
r2323 r2324 167 167 } else { 168 168 retval++; 169 mr_asprintf(tmp, "Warning - missing set(s) between %d and %d\n", g_last_afioball_number, set_number - 1); 170 log_to_screen(tmp); 171 mr_free(tmp); 169 log_to_screen("Warning - missing set(s) between %d and %d\n", g_last_afioball_number, set_number - 1); 172 170 } 173 171 } … … 666 664 if (strcmp(biggie_cksum, orig_cksum)) { 667 665 log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum); 668 mr_asprintf(tmp, "%s has changed on live filesystem", biggie_fname); 669 log_to_screen(tmp); 670 mr_free(tmp); 666 log_to_screen("%s has changed on live filesystem", biggie_fname); 671 667 672 668 mr_asprintf(tmp, "echo \"%s\" >> %s/biggies.changed", biggie_fname, bkpinfo->tmpdir); … … 776 772 res = verify_an_afioball_from_stream(fname, size); 777 773 if (res) { 778 mr_asprintf(tmp, "Afioball %ld differs from live filesystem", current_afioball_number); 779 log_to_screen(tmp); 780 mr_free(tmp); 774 log_to_screen("Afioball %ld differs from live filesystem", current_afioball_number); 781 775 } 782 776 retval += res; … … 981 975 #endif 982 976 { 983 mr_asprintf(tmp, "%s failed; unable to unmount USB device\n", tmp1); 984 log_to_screen(tmp); 985 paranoid_free(tmp); 977 log_to_screen("%s failed; unable to unmount USB device\n", tmp1); 986 978 retval++; 987 979 } else { 988 980 log_msg(2, "OK, I've unmounted the USB device\n"); 989 981 } 990 paranoid_free(tmp1);991 paranoid_free(mountpoint);982 mr_free(tmp1); 983 mr_free(mountpoint); 992 984 return (retval); 993 985 } … … 1053 1045 mddevice = make_vn(fname); 1054 1046 if (ret) { 1055 mr_asprintf(tmp, "make_vn of %s failed; unable to verify ISO\n", fname); 1056 log_to_screen(tmp); 1057 mr_free(tmp); 1047 log_to_screen("make_vn of %s failed; unable to verify ISO\n", fname); 1058 1048 mr_free(mountpoint); 1059 1049 mr_free(fname); … … 1065 1055 #endif 1066 1056 if (run_program_and_log_output(command, FALSE)) { 1067 mr_asprintf(tmp, "%s failed; unable to mount ISO image\n", command); 1068 log_to_screen(tmp); 1069 mr_free(tmp); 1057 log_to_screen("%s failed; unable to mount ISO image\n", command); 1070 1058 mr_free(mountpoint); 1071 1059 mr_free(command); … … 1099 1087 ret += system(command); 1100 1088 ret += kick_vn(mddevice); 1101 if (ret) 1089 if (ret) { 1102 1090 #else 1103 1091 mr_asprintf(command, "umount %s", mountpoint); 1104 if (system(command)) 1092 if (system(command)) { 1105 1093 #endif 1106 { 1107 mr_asprintf(tmp, "%s failed; unable to unmount ISO image\n", command); 1108 log_to_screen(tmp); 1109 mr_free(tmp); 1094 log_to_screen("%s failed; unable to unmount ISO image\n", command); 1110 1095 1111 1096 retval++;
Note:
See TracChangeset
for help on using the changeset viewer.