Changeset 1166 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-restore.c

Timestamp:

Feb 14, 2007, 11:33:50 PM (17 years ago)

Author:

Bruno Cornec

Message:

Suppress g_bkpinfo_DONTUSETHIS (Idea from M. Loiseleur)

File:

• branches/stable/mondo/src/mondorestore/mondo-restore.c (modified) (4 diffs)

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

@@ -38 +38 @@
  **************************************************************************/
 extern char *g_tmpfs_mountpt;   // declared in libmondo-tools.c
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS; // used by finish() to free
-                                                // up global bkpinfo struct
 extern bool g_text_mode;
 extern FILE *g_fprep;
@@ -1580 +1578 @@
 restore_a_tarball_from_CD(char *tarball_fname,
                           long current_tarball_number,
-                          struct s_node *filelist)
+                          struct s_node *filelist, struct s_bkpinfo *)
 {
     int retval = 0;
@@ -2251 +2249 @@
                     restore_a_tarball_from_CD(tarball_fname,
                                               current_tarball_number,
-                                              filelist);
+                                              filelist, bkpinfo);
             }
             sprintf(tmp, "%s #%d, fileset #%ld - restore ",
@@ -2911 +2909 @@
         g_text_mode = FALSE;
     }                           // newt :-)
-    bkpinfo = g_bkpinfo_DONTUSETHIS = mr_malloc(sizeof(struct s_bkpinfo));
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
     mountlist = mr_malloc(sizeof(struct mountlist_itself));
     raidlist = mr_malloc(sizeof(struct raidlist_itself));