Changeset 1080 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c
- Timestamp:
- Jan 28, 2007, 7:04:41 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-stream.c
r1075 r1080 13 13 14 14 #include "my-stuff.h" 15 #include "mr_mem.h" 15 16 #include "mondostructures.h" 16 17 #include "libmondo-devices.h" … … 111 112 int i; 112 113 113 blk = (char *) m alloc(256 * 1024);114 blk = (char *) mr_malloc(256 * 1024); 114 115 115 116 log_it("closein_tape() -- entering"); … … 141 142 eject_device(bkpinfo->media_device); 142 143 } 143 paranoid_free(blk);144 paranoid_free(g_tapecatalog);144 mr_free(blk); 145 mr_free(g_tapecatalog); 145 146 return (retval); 146 147 } … … 170 171 char *blk; 171 172 172 blk = (char *) m alloc(256 * 1024);173 blk = (char *) mr_malloc(256 * 1024); 173 174 174 175 sleep(1); … … 218 219 // if (!bkpinfo->please_dont_eject) 219 220 // { eject_device(bkpinfo->media_device); } 220 paranoid_free(blk);221 paranoid_free(g_tapecatalog);221 mr_free(blk); 222 mr_free(g_tapecatalog); 222 223 return (retval); 223 224 } … … 233 234 sprintf(command, "mt -f %s status", dev); 234 235 res = run_program_and_log_output(command, 1); 235 paranoid_free(command);236 mr_free(command); 236 237 if (res) { 237 238 return (FALSE); … … 596 597 sprintf(tmp, "mt -f %s setblk %ld", tapedev, internal_tape_block_size); 597 598 res = run_program_and_log_output(tmp, 3); 598 paranoid_free(tmp);599 mr_free(tmp); 599 600 return (res); 600 601 } … … 636 637 637 638 assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device); 638 if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) { 639 fatal_error("Cannot alloc mem for tape catalog"); 640 } 639 g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog)); 641 640 g_tapecatalog->entries = 0; 642 641 g_tape_posK = 0; … … 672 671 return (-1); 673 672 } 674 if (!(datablock = (char *) malloc(256 * 1024))) { 675 log_to_screen("Unable to malloc 256*1024"); 676 exit(1); 677 } 673 datablock = (char *) mr_malloc(256 * 1024); 678 674 for (i = 0; i < 32; i++) { 679 675 for (j = 0; j < 4; j++) { … … 692 688 } 693 689 paranoid_fclose(fout); 694 paranoid_free(datablock);690 mr_free(datablock); 695 691 /* find initial blocks */ 696 692 res = read_header_block_from_stream(&size, fname, &ctrl_chr); … … 738 734 /* initialise the catalog */ 739 735 g_current_media_number = 1; 740 if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) { 741 fatal_error("Cannot alloc mem for tape catalog"); 742 } 736 g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog)); 743 737 g_tapecatalog->entries = 0; 744 738 /* log stuff */ … … 771 765 return (0); 772 766 } 773 if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) { 774 fatal_error("Cannot alloc mem for tape catalog"); 775 } 767 g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog)); 776 768 g_tapecatalog->entries = 0; 777 769 g_tape_posK = 0; … … 898 890 malloc_string(temp_cksum); 899 891 malloc_string(actual_cksum); 900 datablock = m alloc(TAPE_BLOCK_SIZE);892 datablock = mr_malloc(TAPE_BLOCK_SIZE); 901 893 crc16 = 0; 902 894 crctt = 0; … … 995 987 /* log_it(tmp); */ 996 988 } 997 paranoid_free(datablock);998 paranoid_free(tmp);999 paranoid_free(temp_fname);1000 paranoid_free(temp_cksum);1001 paranoid_free(actual_cksum);989 mr_free(datablock); 990 mr_free(tmp); 991 mr_free(temp_fname); 992 mr_free(temp_cksum); 993 mr_free(actual_cksum); 1002 994 return (retval); 1003 995 } … … 1028 1020 /*@ end vars *************************************************** */ 1029 1021 1030 tempblock = (char *) m alloc((size_t) TAPE_BLOCK_SIZE);1022 tempblock = (char *) mr_malloc((size_t) TAPE_BLOCK_SIZE); 1031 1023 1032 1024 for (i = 0; i < (int) TAPE_BLOCK_SIZE; i++) { … … 1065 1057 marker_to_string(*pcontrol_char), tempblock + 1000, 1066 1058 (long) (*plen) >> 10); 1067 paranoid_free(tempblock);1059 mr_free(tempblock); 1068 1060 return (retval); 1069 1061 } … … 1172 1164 long bytes_to_write; 1173 1165 1174 datablock = m alloc(TAPE_BLOCK_SIZE);1166 datablock = mr_malloc(TAPE_BLOCK_SIZE); 1175 1167 malloc_string(temp_fname); 1176 1168 pB = strrchr(the_file_I_was_reading, '/'); … … 1265 1257 log_msg(2, "Reading %s (it matches %s)", temp_fname, 1266 1258 the_file_I_was_reading); 1267 paranoid_free(temp_fname);1268 paranoid_free(datablock);1259 mr_free(temp_fname); 1260 mr_free(datablock); 1269 1261 return (0); 1270 1262 } … … 1313 1305 log_msg(3, "Next tape opened OK. Whoopee!"); 1314 1306 } 1315 paranoid_free(sz_msg);1307 mr_free(sz_msg); 1316 1308 return (res); 1317 1309 } … … 1413 1405 } 1414 1406 } 1415 paranoid_free(fname);1407 mr_free(fname); 1416 1408 log_msg(2, "Finished writing back catalog to tape"); 1417 1409 return (res);
Note:
See TracChangeset
for help on using the changeset viewer.