Changeset 1543 in MondoRescue

Timestamp:

Jul 23, 2007, 1:05:36 AM (18 years ago)

Author:

Bruno Cornec

Message:

mr_gettext.h added where necessary
mr_conf is now a pointer on a struct aveywhere

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (2 diffs)
• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-fifo.c (modified) (1 diff)
• common/libmondo-filelist.c (modified) (2 diffs)
• common/libmondo-files.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (5 diffs)

branches/stable/mondo/src/common/libmondo-archive.c ¶

@@ -26 +26 @@
 #include "mr_str.h"
 #include "mr_file.h"
+#include "mr_gettext.h"
 
 #include "libmondo-string-EXT.h"
@@ -41 +42 @@
 #define DVDRWFORMAT 1
 
-extern struct mr_ar_conf mr_conf;
+extern struct mr_ar_conf *mr_conf;
 
 

branches/stable/mondo/src/common/libmondo-devices.c ¶

@@ -17 +17 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
+
 #include "mr_mem.h"
 #include "mr_msg.h"
 #include "mr_str.h"
+#include "mr_gettext.h"
 
 #include <sys/ioctl.h>

branches/stable/mondo/src/common/libmondo-fifo.c ¶

@@ -32 +32 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_gettext.h"
 
 /**

branches/stable/mondo/src/common/libmondo-filelist.c ¶

@@ -16 +16 @@
 #include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
+
 #include "mr_str.h"
 #include "mr_mem.h"
 #include "mr_msg.h"
+#include "mr_gettext.h"
 
 #include <time.h>
@@ -157 +159 @@
 
     if (!does_file_exist(orig_fname)) {
-        log_msg(2, "file %s empty", orig_fname);
+        mr_msg(2, "file %s empty", orig_fname);
         return (0);
     }                           // no sense in trying to sort an empty file

branches/stable/mondo/src/common/libmondo-files.c ¶

@@ -22 +22 @@
 #include "mr_msg.h"
 #include "mr_file.h"
+#include "mr_gettext.h"
 
 /*@unused@*/

branches/stable/mondo/src/mondoarchive/mondoarchive.c ¶

@@ -55 +55 @@
 static char *g_dvd_drive_is_here = NULL;
 
-struct mr_ar_conf mr_conf;
+struct mr_ar_conf *mr_conf = NULL;
 
 /***************** global vars ******************/
@@ -257 +257 @@
     mr_free(mr_cnf->tmp_dir);
     mr_free(mr_cnf->images_dir);
+    mr_free(mr_cnf);
 }
 
@@ -270 +271 @@
     /* Highly incomplete function for the moment */
     /* We have to free all allocated memory */
-    mr_ar_clean_conf(&mr_conf);
+    mr_ar_clean_conf(mr_conf);
     /* We have to remove all temporary files */
     /* We have to unmount what has been mounted */
@@ -332 +333 @@
             mr_log_exit(-1, "Unable to open "MONDO_CONF_DIR"/mondo.conf.dist");
     }
-    mr_ar_store_conf(&mr_conf);
+    mr_conf = malloc(sizeof(struct mr_ar_conf));
+    mr_ar_store_conf(mr_conf);
     /* Reference the right cleanup function for mr_exit now it's allocated */
     mr_cleanup = &mr_ar_cleanup;
@@ -345 +347 @@
             mr_log_exit(-1, "Unable to open "MINDI_CONF_DIR"/mindi.conf.dist");
     }
-    mr_ar_store_conf_mindi(&mr_conf);
+    mr_ar_store_conf_mindi(mr_conf);
     mr_conf_close();
 
     if (mr_conf_open(MINDI_CONF_DIR"/mindi.conf") == 0) {
-        mr_ar_store_conf_mindi(&mr_conf);
+        mr_ar_store_conf_mindi(mr_conf);
         mr_conf_close();
     }