Changeset 2242 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-string.c
- Timestamp:
- Jun 29, 2009, 7:19:18 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/common/libmondo-string.c
r2241 r2242 1092 1092 static char outstr[MAX_STR_LEN]; 1093 1093 char *pos_w_commas, *tmp; 1094 char *mds = NULL; 1094 1095 1095 1096 assert(bkpinfo != NULL); … … 1122 1123 (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / 1123 1124 bkpinfo->media_size[g_current_media_number]); 1124 sprintf(outstr, "%s %d: [",1125 media_descriptor_string(bkpinfo->backup_media_type),1126 g_current_media_number);1125 mds = media_descriptor_string(bkpinfo->backup_media_type); 1126 sprintf(outstr, "%s %d: [", mds, g_current_media_number); 1127 mr_free(mds); 1127 1128 } 1128 1129 for (j = 0; j < percentage; j += 5) { … … 1146 1147 */ 1147 1148 /* BCO/BERLIOS change that function to allocate memory, return a pointer and modify caller to free the mem */ 1148 char *media_descriptor_string(t_bkptype type_of_bkp) 1149 { 1150 static char *type_of_backup = NULL; 1151 1152 if (!type_of_backup) { 1153 malloc_string(type_of_backup); 1154 } 1149 char *media_descriptor_string(t_bkptype type_of_bkp) { 1150 1151 char *type_of_backup = NULL; 1155 1152 1156 1153 switch (type_of_bkp) { 1157 1154 case dvd: 1158 strcpy(type_of_backup, "DVD");1155 mr_asprintf(&type_of_backup, "DVD"); 1159 1156 break; 1160 1157 case cdr: 1161 strcpy(type_of_backup, "CDR");1158 mr_asprintf(&type_of_backup, "CDR"); 1162 1159 break; 1163 1160 case cdrw: 1164 strcpy(type_of_backup, "CDRW");1161 mr_asprintf(&type_of_backup, "CDRW"); 1165 1162 break; 1166 1163 case tape: 1167 strcpy(type_of_backup, "tape");1164 mr_asprintf(&type_of_backup, "tape"); 1168 1165 break; 1169 1166 case cdstream: 1170 strcpy(type_of_backup, "CDR");1167 mr_asprintf(&type_of_backup, "CDR"); 1171 1168 break; 1172 1169 case udev: 1173 strcpy(type_of_backup, "udev");1170 mr_asprintf(&type_of_backup, "udev"); 1174 1171 break; 1175 1172 case iso: 1176 strcpy(type_of_backup, "ISO");1173 mr_asprintf(&type_of_backup, "ISO"); 1177 1174 break; 1178 1175 case nfs: 1179 strcpy(type_of_backup, "nfs");1176 mr_asprintf(&type_of_backup, "nfs"); 1180 1177 break; 1181 1178 case usb: 1182 strcpy(type_of_backup, "USB");1179 mr_asprintf(&type_of_backup, "USB"); 1183 1180 break; 1184 1181 default: 1185 strcpy(type_of_backup, "ISO");1182 mr_asprintf(&type_of_backup, "ISO"); 1186 1183 } 1187 1184 return (type_of_backup);
Note:
See TracChangeset
for help on using the changeset viewer.