Changeset 3194 in MondoRescue for branches/3.2/mondo/src/common/libmondo-files.c

Timestamp:

Sep 29, 2013, 7:27:11 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix all compilation/link error due to the previous giant merge with 3.1. 3.2 is ready to test

File:

• branches/3.2/mondo/src/common/libmondo-files.c (modified) (29 diffs)

branches/3.2/mondo/src/common/libmondo-files.c

@@ -291 +291 @@
     log_it("Calling Mindi with kernel path of '%s'", kernel);
     while (!kernel[0]) {
-        if (!ask_me_yes_or_no
-            ("Kernel not found or invalid. Choose another?")) {
+        if (!ask_me_yes_or_no("Kernel not found or invalid. Choose another?")) {
             return (1);
         }
-        if (!popup_and_get_string
-            ("Kernel path",
-             "What is the full path and filename of your kernel, please?",
-             kernel, MAX_STR_LEN / 4)) {
-            fatal_error
-                ("Kernel not found. Please specify with the '-k' flag.");
+        if (!popup_and_get_string("Kernel path", "What is the full path and filename of your kernel, please?", kernel, MAX_STR_LEN / 4)) {
+            fatal_error("Kernel not found. Please specify with the '-k' flag.");
         }
         log_it("User says kernel is at %s", kernel);
@@ -335 +330 @@
             mr_free(incoming);
             output[0] = '\0';
-            return (NULL);      // forget it :)
+            return(NULL);       // forget it :)
         }
         mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
-        mr_free(incomig);
+        mr_free(incoming);
 
         mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
@@ -352 +347 @@
     strcpy(output, incoming);
     if (output[0] != '\0' && does_file_exist(output)) {
-        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname, incoming);
+        log_msg(4, "find_home_of_exe --- Found %s at %s", fname, incoming);
     } else {
         output[0] = '\0';
-        log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
+        log_msg(4, "find_home_of_exe --- Could not find %s", fname);
     }
     mr_free(incoming);
     if (!output[0]) {
-        return (NULL);
+        return(NULL);
     } else {
-        return (output);
+        return(output);
     }
 }
@@ -433 +428 @@
         if (!lastline[0]) {
             mr_free(lastline);
-            return (0);
+            return(0);
         }
     } else {
@@ -444 +439 @@
     } else {
         mr_free(lastline);
-        return (0);
+        return(0);
     }
 
@@ -453 +448 @@
     i = atoi(p);
     mr_free(lastline);
-    return (i);
+    return(i);
 }
 
@@ -471 +466 @@
     static char output[MAX_STR_LEN];
     char *command = NULL;
+    char *p = NULL;
 
     /*@ pointers **************************************************** */
@@ -478 +474 @@
 
     if (!does_file_exist(filename)) {
-        log_it("Tring to get last line of nonexistent file (%s)", filename);
+        log_it("Trying to get last line of nonexistent file (%s)", filename);
         output[0] = '\0';
         return (output);
@@ -493 +489 @@
         output[strlen(output) - 1] = '\0';
     }
-    return (output);
+    return(output);
 }
 
@@ -513 +509 @@
         log_it("filename=%s", filename);
         log_OS_error("Unable to openin filename");
-        return (-1);
+        return(-1);
     }
     fseeko(fin, 0, SEEK_END);
     length = ftello(fin);
     paranoid_fclose(fin);
-    return (length);
+    return(length);
 }
 
@@ -561 +557 @@
         log_OS_error("Unable to fopen-in filelist");
         log_to_screen("Can't open filelist");
-        return (1);
+        return(1);
     }
     fout = fopen(cksumlist, "w");
@@ -568 +564 @@
         paranoid_fclose(fin);
         log_to_screen("Can't open checksum list");
-        return (1);
+        return(1);
     }
     for (mr_getline(stub_fname, fin); !feof(fin); mr_getline(stub_fname, fin)) {
-        if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) {
+        i = strlen(stub_fname) - 1;
+        if (stub_fname[i] < 32) {
             stub_fname[i] = '\0';
         }
@@ -605 +602 @@
     paranoid_fclose(fin);
     log_it("Done.");
-    return (0);
+    return(0);
 }
 
@@ -623 +620 @@
     res = system(tmp);
     mr_free(tmp);
-    return (res);
+    return(res);
 }
 
@@ -659 +656 @@
 
     unlink(outfile_fname);
-    return (0);
+    return(0);
 }
 
@@ -687 +684 @@
     if (!fin) {
         log_OS_error("Unable to openin filelist_fname");
-        return (0);
+        return(0);
     }
     mr_getline(incoming, fin);
@@ -699 +696 @@
     mr_free(incoming);
     paranoid_fclose(fin);
-    return (matches);
+    return(matches);
 }
 
@@ -728 +725 @@
     mr_free(command);
 
-    return (file_len_K);
+    return(file_len_K);
 }
 
@@ -806 +803 @@
     paranoid_fclose(fin);
     log_it("Finished calculating total size of all biggiefiles");
-    return (scratchL);
+    return(scratchL);
 }
 
@@ -848 +845 @@
     mr_free(command);
 
-    return (llres);
+    return(llres);
 }
 
@@ -864 +861 @@
     tmp = (crc >> 8) ^ c;
     crc = (crc << 8) ^ crctttab[tmp & 255];
-    return crc;
+    return(crc);
 }
 
@@ -879 +876 @@
     tmp = crc ^ c;
     crc = (crc >> 8) ^ crc16tab[tmp & 0xff];
-    return crc;
+    return(crc);
 }
 
@@ -905 +902 @@
         log_to_screen("There may be hyperlink at http://www.mondorescue.org which");
         log_to_screen("will take you to the relevant (missing) package.");
-        return (1);
+        return(1);
     } else {
-        return (0);
+        return(0);
     }
 }
@@ -969 +966 @@
         log_it("fname=%s", fname);
         log_OS_error("Unable to openin fname");
-        return (1);
+        return(1);
     }
     res = fscanf(fin, "%s\n", contents);
@@ -978 +975 @@
     paranoid_fclose(fin);
     res = 0;
-    return (res);
-}
-
-
-
+    return(res);
+}
 
 
@@ -1084 +1078 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 }
-
-
-
 
 
@@ -1115 +1106 @@
     char *p;
 
-    if (! bkpinfo->netfs_mount) {
+    if (bkpinfo->netfs_mount == NULL) {
         fatal_error("No netfs_mount found !");
     }
@@ -1152 +1143 @@
 
     mr_asprintf(command, "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
-    mr_asprintf(netfs_client_hwaddr, "%s" call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_client_hwaddr, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -1229 +1220 @@
     mr_free(tmp);
 
-    sprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
     mr_free(tmp);