Changeset 1543 in MondoRescue for branches/stable/mondo/src/mondoarchive/mondoarchive.c

Timestamp:

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

Author:

Bruno Cornec

Message:

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

File:

• branches/stable/mondo/src/mondoarchive/mondoarchive.c (modified) (5 diffs)

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();
     }