Changeset 1080 in MondoRescue for branches/stable/mondo/src/common/newt-specific.c
- Timestamp:
- Jan 28, 2007, 7:04:41 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/newt-specific.c
r1075 r1080 19 19 20 20 #include "my-stuff.h" 21 #include "mr_mem.h" 21 22 #include "mondostructures.h" 22 23 #include "newt-specific.h" … … 120 121 int i; 121 122 122 tmp = m alloc(MAX_NEWT_COMMENT_LEN);123 tmp = mr_malloc(MAX_NEWT_COMMENT_LEN); 123 124 assert_string_is_neither_NULL_nor_zerolength(prompt); 124 125 … … 138 139 } 139 140 if (strstr("yesYES", tmp)) { 140 paranoid_free(tmp);141 mr_free(tmp); 141 142 return (TRUE); 142 143 } else if (strstr("NOno", tmp)) { 143 paranoid_free(tmp);144 mr_free(tmp); 144 145 return (FALSE); 145 146 } else { … … 150 151 } 151 152 } else { 152 paranoid_free(tmp);153 mr_free(tmp); 153 154 return (popup_with_buttons(prompt, "Yes", "No")); 154 155 } … … 168 169 int i; 169 170 170 tmp = m alloc(MAX_NEWT_COMMENT_LEN);171 tmp = mr_malloc(MAX_NEWT_COMMENT_LEN); 171 172 assert_string_is_neither_NULL_nor_zerolength(prompt); 172 173 if (g_text_mode) { … … 184 185 } 185 186 if (strstr("okOKOkYESyes", tmp)) { 186 paranoid_free(tmp);187 mr_free(tmp); 187 188 return (TRUE); 188 189 } else { 189 paranoid_free(tmp);190 mr_free(tmp); 190 191 return (FALSE); 191 192 } 192 193 } else { 193 paranoid_free(tmp);194 mr_free(tmp); 194 195 return (popup_with_buttons(prompt, " Okay ", "Cancel")); 195 196 } … … 259 260 asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -vx \"\\?\"`", ps_options, str , ps_proc_id); 260 261 run_program_and_log_output(tmp, TRUE); 261 paranoid_free(tmp);262 mr_free(tmp); 262 263 } 263 264 … … 281 282 282 283 malloc_string(command); 283 tmp = m alloc(MAX_NEWT_COMMENT_LEN);284 tmp = mr_malloc(MAX_NEWT_COMMENT_LEN); 284 285 set_signals(FALSE); // link to external func 285 286 g_exiting = TRUE; … … 289 290 log_msg(2, "mastermind %d is exiting", (int) getpid()); 290 291 kill(g_main_pid, SIGTERM); 291 paranoid_free(tmp);292 mr_free(tmp); 292 293 finish(1); 293 294 } … … 297 298 log_msg(2, "non-m/m %d is exiting", (int) getpid()); 298 299 kill(g_main_pid, SIGTERM); 299 paranoid_free(tmp);300 mr_free(tmp); 300 301 finish(1); 301 302 } … … 305 306 if (already_exiting) { 306 307 log_msg(3, "...I'm already exiting. Give me time, Julian!"); 307 paranoid_free(tmp);308 mr_free(tmp); 308 309 finish(1); 309 310 } … … 360 361 log_msg(3, "FYI - g_main_pid is blank"); 361 362 } 362 paranoid_free(tmp);363 paranoid_free(command);363 mr_free(tmp); 364 mr_free(command); 364 365 finish(254); 365 366 } … … 445 446 446 447 if (!does_file_exist(filename)) { 447 paranoid_free(command);448 paranoid_free(tmp);448 mr_free(command); 449 mr_free(tmp); 449 450 return; 450 451 } … … 478 479 } 479 480 refresh_log_screen(); 480 paranoid_free(command);481 paranoid_free(tmp);481 mr_free(command); 482 mr_free(tmp); 482 483 } 483 484 … … 533 534 refresh_log_screen(); 534 535 } 535 paranoid_free(output);536 mr_free(output); 536 537 } 537 538 … … 606 607 } 607 608 update_evalcall_form(0); 608 paranoid_free(tmp);609 paranoid_free(title);609 mr_free(tmp); 610 mr_free(title); 610 611 } 611 612 … … 680 681 } 681 682 update_progress_form_full(blurb1, blurb2, blurb3); 682 paranoid_free(b1c);683 paranoid_free(blurb1);684 paranoid_free(blurb2);685 paranoid_free(blurb3);683 mr_free(b1c); 684 mr_free(blurb1); 685 mr_free(blurb2); 686 mr_free(blurb3); 686 687 } 687 688 … … 733 734 char *original_contents; 734 735 735 blurb = m alloc(MAX_NEWT_COMMENT_LEN);736 original_contents = m alloc(MAX_NEWT_COMMENT_LEN);736 blurb = mr_malloc(MAX_NEWT_COMMENT_LEN); 737 original_contents = mr_malloc(MAX_NEWT_COMMENT_LEN); 737 738 assert_string_is_neither_NULL_nor_zerolength(title); 738 739 assert(b != NULL); … … 746 747 if (output[strlen(output) - 1] == '\n') 747 748 output[strlen(output) - 1] = '\0'; 748 paranoid_free(blurb);749 paranoid_free(original_contents);749 mr_free(blurb); 750 mr_free(original_contents); 750 751 return (TRUE); 751 752 } … … 778 779 if (b_res == b_2) { 779 780 strcpy(output, original_contents); 780 paranoid_free(blurb);781 paranoid_free(original_contents);781 mr_free(blurb); 782 mr_free(original_contents); 782 783 return (FALSE); 783 784 } else { 784 paranoid_free(blurb);785 paranoid_free(original_contents);785 mr_free(blurb); 786 mr_free(original_contents); 786 787 return (TRUE); 787 788 } … … 808 809 newtComponent text; 809 810 810 prompt = m alloc(MAX_NEWT_COMMENT_LEN);811 tmp = m alloc(MAX_NEWT_COMMENT_LEN);811 prompt = mr_malloc(MAX_NEWT_COMMENT_LEN); 812 tmp = mr_malloc(MAX_NEWT_COMMENT_LEN); 812 813 assert_string_is_neither_NULL_nor_zerolength(p); 813 814 assert(button1 != NULL); … … 826 827 } 827 828 if (!strcmp(tmp, button1)) { 828 paranoid_free(tmp);829 paranoid_free(prompt);829 mr_free(tmp); 830 mr_free(prompt); 830 831 return (TRUE); 831 832 } else { 832 paranoid_free(tmp);833 paranoid_free(prompt);833 mr_free(tmp); 834 mr_free(prompt); 834 835 return (FALSE); 835 836 } … … 862 863 newtPopWindow(); 863 864 if (b_res == b_1) { 864 paranoid_free(tmp);865 paranoid_free(prompt);865 mr_free(tmp); 866 mr_free(prompt); 866 867 return (TRUE); 867 868 } else { 868 paranoid_free(tmp);869 paranoid_free(prompt);869 mr_free(tmp); 870 mr_free(prompt); 870 871 return (FALSE); 871 872 } … … 927 928 928 929 err_log_lines = 929 (char **) m alloc(sizeof(char *) * g_noof_log_lines);930 (char **) mr_malloc(sizeof(char *) * g_noof_log_lines); 930 931 if (!err_log_lines) { 931 932 fatal_error("Out of memory"); … … 933 934 934 935 for (i = 0; i < g_noof_log_lines; i++) { 935 err_log_lines[i] = (char *) m alloc(MAX_NEWT_COMMENT_LEN);936 err_log_lines[i] = (char *) mr_malloc(MAX_NEWT_COMMENT_LEN); 936 937 if (!err_log_lines[i]) { 937 938 fatal_error("Out of memory"); … … 1043 1044 newtRefresh(); 1044 1045 } 1045 paranoid_free(timeline_str);1046 paranoid_free(pcline_str);1047 paranoid_free(taskprogress);1046 mr_free(timeline_str); 1047 mr_free(pcline_str); 1048 mr_free(taskprogress); 1048 1049 } 1049 1050 … … 1104 1105 1105 1106 // log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3); 1106 percentline_str = m alloc(MAX_NEWT_COMMENT_LEN);1107 timeline_str = m alloc(MAX_NEWT_COMMENT_LEN);1108 taskprogress = m alloc(MAX_NEWT_COMMENT_LEN);1107 percentline_str = mr_malloc(MAX_NEWT_COMMENT_LEN); 1108 timeline_str = mr_malloc(MAX_NEWT_COMMENT_LEN); 1109 taskprogress = mr_malloc(MAX_NEWT_COMMENT_LEN); 1109 1110 malloc_string(tmp); 1110 1111 if (!g_text_mode) { … … 1190 1191 newtRefresh(); 1191 1192 } 1192 paranoid_free(percentline_str);1193 paranoid_free(timeline_str);1194 paranoid_free(taskprogress);1195 paranoid_free(tmp);1193 mr_free(percentline_str); 1194 mr_free(timeline_str); 1195 mr_free(taskprogress); 1196 mr_free(tmp); 1196 1197 } 1197 1198 … … 1246 1247 newtComponent myForm; 1247 1248 1248 title_sz = m alloc(MAX_NEWT_COMMENT_LEN);1249 minimsg_sz = m alloc(MAX_NEWT_COMMENT_LEN);1250 outstr = m alloc(MAX_NEWT_COMMENT_LEN);1249 title_sz = mr_malloc(MAX_NEWT_COMMENT_LEN); 1250 minimsg_sz = mr_malloc(MAX_NEWT_COMMENT_LEN); 1251 outstr = mr_malloc(MAX_NEWT_COMMENT_LEN); 1251 1252 if (g_text_mode) { 1252 1253 for (backup_type = none; backup_type == none;) { … … 1265 1266 } 1266 1267 } 1267 paranoid_free(title_sz);1268 paranoid_free(minimsg_sz);1269 paranoid_free(outstr);1268 mr_free(title_sz); 1269 mr_free(minimsg_sz); 1270 mr_free(outstr); 1270 1271 return (backup_type); 1271 1272 } … … 1315 1316 } 1316 1317 newtPopHelpLine(); 1317 paranoid_free(title_sz);1318 paranoid_free(minimsg_sz);1319 paranoid_free(outstr);1318 mr_free(title_sz); 1319 mr_free(minimsg_sz); 1320 mr_free(outstr); 1320 1321 return (output); 1321 1322 } … … 1403 1404 log_msg(2, "Can't open %s; therefore, cannot popup list", 1404 1405 source_file); 1405 paranoid_free(tmp);1406 mr_free(tmp); 1406 1407 return (1); 1407 1408 } … … 1437 1438 if (filelist->entries >= ARBITRARY_MAXIMUM) { 1438 1439 log_to_screen("Arbitrary limits suck, man!"); 1439 paranoid_free(tmp);1440 mr_free(tmp); 1440 1441 return (1); 1441 1442 } … … 1465 1466 } 1466 1467 } 1467 paranoid_free(tmp);1468 mr_free(tmp); 1468 1469 iamhere("leaving"); 1469 1470 return (0); … … 1498 1499 tmp[98] = '\0'; 1499 1500 strcpy(comment, tmp); 1500 paranoid_free(tmp);1501 mr_free(tmp); 1501 1502 iamhere("leaving"); 1502 1503 return (comment); … … 1539 1540 struct s_filelist *filelist; 1540 1541 malloc_string(reason); 1541 tmp = m alloc(5000);1542 tmp = mr_malloc(5000); 1542 1543 malloc_string(differ_sz); 1543 1544 assert_string_is_neither_NULL_nor_zerolength(source_file); … … 1551 1552 if (lng < 1) { 1552 1553 log_msg(2, "No lines in file. Therefore, no popup list."); 1553 paranoid_free(reason);1554 mr_free(reason); 1554 1555 goto free_to_go; 1555 1556 } else if (lng >= ARBITRARY_MAXIMUM) { … … 1558 1559 } 1559 1560 1560 filelist = (struct s_filelist *) m alloc(sizeof(struct s_filelist));1561 filelist = (struct s_filelist *) mr_malloc(sizeof(struct s_filelist)); 1561 1562 fileListbox = 1562 1563 newtListbox(2, 2, 12, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT); … … 1566 1567 log_msg(2, "Can't open %s; therefore, cannot popup list", 1567 1568 source_file); 1568 paranoid_free(reason);1569 mr_free(reason); 1569 1570 return; 1570 1571 } … … 1618 1619 newtPopHelpLine(); 1619 1620 free_to_go: 1620 paranoid_free(reason);1621 paranoid_free(tmp);1622 paranoid_free(differ_sz);1621 mr_free(reason); 1622 mr_free(tmp); 1623 mr_free(differ_sz); 1623 1624 return; 1624 1625 }
Note:
See TracChangeset
for help on using the changeset viewer.