Changeset 2400 in MondoRescue
- Timestamp:
- Sep 15, 2009, 7:33:17 PM (15 years ago)
- Location:
- branches/2.2.10/mondo/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-devices.c
r2383 r2400 1719 1719 mr_free(command); 1720 1720 1721 p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto); 1722 if (p == NULL) { 1723 log_to_screen("User has chosen not to backup the PC"); 1724 finish(1); 1725 } 1726 mr_free(bkpinfo->netfs_proto); 1727 bkpinfo->netfs_proto = p; 1728 1721 1729 p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount); 1722 1730 if (p == NULL) { -
branches/2.2.10/mondo/src/common/libmondo-string.c
r2382 r2400 1075 1075 * @note The returned string points to static storage that will be overwritten with each call. 1076 1076 */ 1077 /* BCO/BERLIOS change that function to allocate memory, return a pointer and modify caller to free the mem */1078 1077 char *media_descriptor_string(t_bkptype type_of_bkp) { 1079 1078 … … 1103 1102 break; 1104 1103 case netfs: 1105 mr_asprintf(type_of_backup, " netfs");1104 mr_asprintf(type_of_backup, "%s", bkpinfo->netfs_proto); 1106 1105 break; 1107 1106 case usb: -
branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c
r2395 r2400 1965 1965 while (!finished) { 1966 1966 flaws_str = evaluate_mountlist(mountlist); 1967 if (strlen(flaws_str) > 0) { 1967 /* flaws_str can be NULL */ 1968 if ((flaws_str == NULL) || (strlen(flaws_str) == 0)) { 1969 mr_asprintf(flaws_str_A, ""); 1970 } else { 1968 1971 mr_asprintf(flaws_str_A, "%s", flaws_str + 1); 1969 } else {1970 mr_asprintf(flaws_str_A, "");1971 1972 } 1972 1973 if (strlen(flaws_str_A) >= 74) { … … 1984 1985 mr_asprintf(flaws_str_C, ""); 1985 1986 } 1986 mr_free(flaws_str);1987 1987 1988 1988 newtLabelSetText(flawsLabelA, flaws_str_A); … … 1995 1995 1996 1996 if (b_res == bOK) { 1997 flaws_str = evaluate_mountlist(mountlist);1998 1997 if (flaws_str != NULL) { 1999 mr_free(flaws_str);2000 1998 finished = 2001 1999 ask_me_yes_or_no … … 2042 2040 } 2043 2041 } 2042 mr_free(flaws_str); 2044 2043 } 2045 2044 newtFormDestroy(myForm);
Note:
See TracChangeset
for help on using the changeset viewer.