Changeset 1265 in MondoRescue

Timestamp:

Mar 24, 2007, 10:04:37 AM (18 years ago)

Author:

Bruno Cornec

Message:

Compiler errors again

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (3 diffs)
• mondorestore.c (modified) (5 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -282 +282 @@
 {
     char *mount_isodir_command = NULL;
-    char *tmp = NULL;
     char *command = NULL;
     int retval = 0, i = 0;
@@ -462 +461 @@
                 mr_msg(1,
                         "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
-            } else {
-                log_to_screen(tmp);
             }
         }
@@ -1289 +1286 @@
 
     char *device = NULL;
+#ifdef __FreeBSD__
     char *tmp = NULL;
+#endif
     char *name = NULL;
 

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -20 +20 @@
 #include "mr_str.h"
 #include "mr_err.h"
+#include "mr_conf.h"
 
 #include "mondostructures.h"
@@ -139 +140 @@
         return;
     }
-    mr_free(&mr_cnf->media_device);
-    mr_free(&mr_cnf->prefix);
-    mr_free(&mr_cnf->boot_loader);
-    mr_free(&mr_cnf->compression_tool);
-    mr_free(&mr_cnf->ui_mode);
-    mr_free(&mr_cnf->images_dir);
+    mr_free(mr_cnf->media_device);
+    mr_free(mr_cnf->prefix);
+    mr_free(mr_cnf->boot_loader);
+    mr_free(mr_cnf->compression_tool);
+    mr_free(mr_cnf->ui_mode);
+    mr_free(mr_cnf->images_dir);
 }
 
@@ -157 +158 @@
     mr_rs_clean_conf(&mr_conf);
     */
+    mr_rs_clean_conf(NULL);
     /* We have to remove all temporary files */
     /* We have to unmount what has been mounted */
@@ -2729 +2731 @@
  * Log a "don't panic" message to the logfile.
  */
-void welcome_to_mondorestore()
+void welcome_to_mondorestore(void)
 {
     mr_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
@@ -2767 +2769 @@
  * What did you think it did, anyway? :-)
  */
-int main(int argc, char *argv[])
+void main(int argc, char *argv[])
 {
     FILE *fin = NULL;