Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-stream.c

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

File:

• branches/2.2.10/mondo/src/common/libmondo-stream.c (modified) (7 diffs)

branches/2.2.10/mondo/src/common/libmondo-stream.c

@@ -253 +253 @@
     char *dev = NULL;
     int res;
-    char *dev = NULL;
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
@@ -260 +259 @@
     if (tmp) {
         mr_asprintf(cdr_exe, "cdrecord");
-
     } else {
         mr_asprintf(cdr_exe, "dvdrecord");
@@ -273 +271 @@
         log_it("Either too few or too many tape streamers for me to detect...");
         mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
-        mr_free(tmp);
         mr_free(tmp);
         return(dev);
@@ -350 +347 @@
     } else {
         log_it("At this new point, dev is NULL and res = %d", res);
-        mr_free(tmp);
     }
 
@@ -531 +527 @@
     char *tmpdir = NULL;
     char *old_fname = NULL;
-    char *p;
-    char suffix[16];
 
     bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB));
-    if ((p = strrchr(latest_fname, '.'))) {
-        strcpy(suffix, ++p);
-    } else {
-        suffix[0] = '\0';
-    }
     if (strstr(latest_fname, ".afio.") || strstr(latest_fname, ".star.")) {
         type = fileset;
@@ -1186 +1175 @@
                   g_tape_stream) / 1024;
     }
-/*  memcpy((char*)plength_of_incoming_file,(char*)tempblock+7001,sizeof(long long)); */
-/*  for(*plen=0,i=7;i>=0;i--) {*plen<<=8; *plen |= tempblock[7001+i];} */
     memcpy((char *) plen, tempblock + 7001, sizeof(long long));
     if (strcmp(tempblock + 6000 + *pcontrol_char, STR_HEADER)) {
@@ -1193 +1180 @@
     }
     strcpy(filename, tempblock + 1000);
-/*  strcpy(cksum,tempblock+5555);*/
-/*  log_it( "%s  (reading) fname=%s, filesize=%ld K",
-       marker_to_string (*pcontrol_char), filename,
-       (long) ((*plen) >> 10));
-*/
     if (*pcontrol_char == BLK_ABORTED_BACKUP) {
         log_to_screen("I can't verify an aborted backup.");