Changeset 1646 in MondoRescue

Timestamp:

Sep 24, 2007, 3:07:18 AM (17 years ago)

Author:

Bruno Cornec

Message:

Remove g_bkpinfo_DONTUSETHIS

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (1 diff)
• common/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-restore-EXT.h (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.5/mondo/src/common/libmondo-devices.c

@@ -258 +258 @@
 
 extern bool g_ISO_restore_mode;
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
 extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_selfmounted_isodir;

branches/2.2.5/mondo/src/common/libmondo-mountlist.c

@@ -62 +62 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
-
-/**
- * A global copy of @c bkpinfo, to aid in debugging. As the name implies, <em>don't use this</em>.
- * @ingroup globalGroup
- */
-struct s_bkpinfo *g_bkpinfo_DONTUSETHIS = NULL;
 
 /* Reference to global bkpinfo */

branches/2.2.5/mondo/src/common/my-stuff.h

@@ -429 +429 @@
  * Free variables and call finish(@p x).
  */
-#define paranoid_MR_finish(x) {free_MR_global_filenames (); if (g_bkpinfo_DONTUSETHIS) paranoid_free ( g_bkpinfo_DONTUSETHIS ); finish(x); }
+#define paranoid_MR_finish(x) {free_MR_global_filenames (); finish(x); }
 
 /**

branches/2.2.5/mondo/src/mondorestore/mondo-restore-EXT.h

@@ -12 +12 @@
 extern char *g_isodir_format;
 
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
 extern char *g_biggielist_txt;
 extern char *g_filelist_full;

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

@@ -40 +40 @@
  **************************************************************************/
 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;
@@ -2915 +2913 @@
     }                           // newt :-)
     if (!
-        (bkpinfo = g_bkpinfo_DONTUSETHIS =
-         malloc(sizeof(struct s_bkpinfo)))) {
+        (bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
         fatal_error("Cannot malloc bkpinfo");
     }

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

@@ -155 +155 @@
 extern char *g_mountlist_fname; // where mountlist.txt (the mountlist file) is stored
 extern char *g_mondo_home;      // homedir of Mondo; usually /usr/local/share/mondo
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
 
 extern t_bkptype g_backup_media_type;