Changeset 1081 in MondoRescue for trunk/mondo/src/common/libmondo-stream.c
- Timestamp:
- Jan 28, 2007, 11:20:07 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/common/libmondo-stream.c
r979 r1081 13 13 14 14 #include "my-stuff.h" 15 #include "mr_mem.h" 15 16 #include "mondostructures.h" 16 17 #include "libmondo-devices.h" … … 106 107 int i; 107 108 108 blk = (char *) m alloc(256 * 1024);109 blk = (char *) mr_malloc(256 * 1024); 109 110 110 111 log_it("closein_tape() -- entering"); … … 153 154 char *blk; 154 155 155 blk = (char *) m alloc(256 * 1024);156 blk = (char *) mr_malloc(256 * 1024); 156 157 157 158 sleep(1); … … 624 625 625 626 assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device); 626 if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) { 627 fatal_error("Cannot alloc mem for tape catalog"); 628 } 627 g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog)); 629 628 g_tapecatalog->entries = 0; 630 629 g_tape_posK = 0; … … 658 657 return (-1); 659 658 } 660 if (!(datablock = (char *) malloc(256 * 1024))) { 661 log_to_screen(_("Unable to malloc 256*1024")); 662 exit(1); 663 } 659 datablock = (char *) mr_malloc(256 * 1024); 664 660 for (i = 0; i < 32; i++) { 665 661 for (j = 0; j < 4; j++) { … … 726 722 /* initialise the catalog */ 727 723 g_current_media_number = 1; 728 if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) { 729 fatal_error("Cannot alloc mem for tape catalog"); 730 } 724 g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog)); 731 725 g_tapecatalog->entries = 0; 732 726 /* log stuff */ … … 759 753 return (0); 760 754 } 761 if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) { 762 fatal_error("Cannot alloc mem for tape catalog"); 763 } 755 g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog)); 764 756 g_tapecatalog->entries = 0; 765 757 g_tape_posK = 0; … … 872 864 873 865 /*@ init ******************************************************* */ 874 datablock = m alloc(TAPE_BLOCK_SIZE);866 datablock = mr_malloc(TAPE_BLOCK_SIZE); 875 867 crc16 = 0; 876 868 crctt = 0; … … 1003 995 /*@ end vars *************************************************** */ 1004 996 1005 tempblock = (char *) m alloc((size_t) TAPE_BLOCK_SIZE);997 tempblock = (char *) mr_malloc((size_t) TAPE_BLOCK_SIZE); 1006 998 1007 999 for (i = 0; i < (int) TAPE_BLOCK_SIZE; i++) { … … 1142 1134 long bytes_to_write; 1143 1135 1144 datablock = m alloc(TAPE_BLOCK_SIZE);1136 datablock = mr_malloc(TAPE_BLOCK_SIZE); 1145 1137 pB = strrchr(the_file_I_was_reading, '/'); 1146 1138 if (pB) {
Note:
See TracChangeset
for help on using the changeset viewer.