Changeset 147 in MondoRescue for trunk

Timestamp:

Dec 1, 2005, 10:26:01 AM (19 years ago)

Author:

bcornec

Message:

Quality errors handled

Location:

trunk/mondo/mondo/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-filelist.c (modified) (1 diff)
• libmondo-fork.c (modified) (4 diffs)
• libmondo-stream.c (modified) (10 diffs)

trunk/mondo/mondo/common/libmondo-devices.c

@@ -186 +186 @@
         asprintf(&output, "default");
     }
-    return (&output);
+    return (output);
 }
 

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -260 +260 @@
         return (0);
     }
-    (void) fgets(&incoming, &n, fin);
+    (void) getline(&incoming, &n, fin);
     while (!feof(fin)) {
         lino++;

trunk/mondo/mondo/common/libmondo-fork.c

@@ -302 +302 @@
     int retval = 0;
     int res = 0;
-    int n = 0;
     int i;
 
@@ -344 +343 @@
         }
     }
-#ifdef _XWIN
-    /* This only can update when newline goes into the file,
-       but it's *much* prettier/faster on Qt. */
-    tmp = NULL;
-    while (does_file_exist(lockfile)) {
-        while (!feof(fin)) {
-            if (!getline(&tmp, &n, fin))
-                break;
-            log_to_screen(tmp);
-        }
-        usleep(500000);
-    }
-    paranoid_free(tmp);
-#else
     /* This works on Newt, and it gives quicker updates. */
     for (; does_file_exist(lockfile); sleep(1)) {
@@ -363 +348 @@
         update_evalcall_form(1);
     }
-#endif
     /* Evaluate the status returned by pclose to get the exit code of the called program. */
     errno = 0;
@@ -905 +889 @@
     int res;
     char *curr_fifo;
-    char *prev_fifo;
+    char *prev_fifo = NULL;
     char *oldest_fifo = NULL;
     char *next_fifo;

trunk/mondo/mondo/common/libmondo-stream.c

@@ -332 +332 @@
     int res = 0;
     int retval = 0;
-    char *fname = &res;         /* Should NOT be NULL */
+    char *fname = (char *)&res;         /* Should NOT be NULL */
 
 // xattr
@@ -343 +343 @@
     }
     paranoid_free(fname);
-    fname = &res;
+    fname = (char *)&res;
     read_file_from_stream_to_file(bkpinfo, xattr_fname, *ptmp_size);
     res = read_header_block_from_stream(ptmp_size, NULL, pctrl_chr);
@@ -355 +355 @@
     }
     paranoid_free(fname);
-    fname = &res;
+    fname = (char *)&res;
     if (*pctrl_chr != BLK_START_EXAT_FILE) {
         wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
@@ -470 +470 @@
     char *tmpdir;
     char *old_fname;
-    char *p;
-    /* BERLIOS: useless
-       char suffix[16];
-     */
 
     bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB));
     asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
-    /* BERLIOS: useless
-       if ((p = strrchr(latest_fname, '.'))) {
-       strcpy(suffix, ++p);
-       } else {
-       suffix[0] = '\0';
-       }
-     */
     if (strstr(latest_fname, ".afio.") || strstr(latest_fname, ".star.")) {
         type = fileset;
@@ -696 +685 @@
 {
     /*@ buffers ***************************************************** */
-    char command;
+    char *command;
 
     /*@ end vars *************************************************** */
@@ -823 +812 @@
     char *tmp;
     char *datablock;
-    char *temp_fname = bkpinfo; /* Should NOT be NULL */
-    char *temp_cksum = bkpinfo; /* Should NOT be NULL */
+    char *temp_fname = (char *)bkpinfo; /* Should NOT be NULL */
+    char *temp_cksum = (char *)bkpinfo; /* Should NOT be NULL */
     char *actual_cksum;
 
@@ -1116 +1105 @@
     int res;
     int ctrl_chr;
-    char *temp_fname = &res;    /* should NOT be NULL */
+    char *temp_fname = (char *)&res;    /* should NOT be NULL */
     char *datablock;
     long long temp_size, size;
@@ -1142 +1131 @@
         log_msg(3, "Still trying to re-sync w/ tape");
         paranoid_free(temp_fname);
-        temp_fname = &res;
+        temp_fname = (char *)&res;
     }
     while (ctrl_chr != BLK_START_FILE) {
@@ -1157 +1146 @@
         if (ctrl_chr != BLK_START_FILE) {
             paranoid_free(temp_fname);
-            temp_fname = &res;
+            temp_fname = (char *)&res;
         }
     }
@@ -1183 +1172 @@
 
         paranoid_free(temp_fname);
-        temp_fname = &res;
+        temp_fname = (char *)&res;
         res = read_header_block_from_stream(&temp_size, NULL, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_FILE) {