Changeset 1166 in MondoRescue


Ignore:
Timestamp:
Feb 14, 2007, 11:33:50 PM (17 years ago)
Author:
Bruno Cornec
Message:

Suppress g_bkpinfo_DONTUSETHIS (Idea from M. Loiseleur)

Location:
branches/stable/mondo/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r1156 r1166  
    4141
    4242extern bool g_ISO_restore_mode;
    43 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
    4443extern char *g_erase_tmpdir_and_scratchdir;
    4544extern char *g_selfmounted_isodir;

  • branches/stable/mondo/src/common/libmondo-mountlist.c

    r1147 r1166  
    2222/*@unused@*/
    2323//static char cvsid[] = "$Id$";
    24 
    25 /**
    26  * A global copy of @c bkpinfo, to aid in debugging. As the name implies, <em>don't use this</em>.
    27  * @ingroup globalGroup
    28  */
    29 struct s_bkpinfo *g_bkpinfo_DONTUSETHIS = NULL;
    3024
    3125/**

  • branches/stable/mondo/src/include/my-stuff.h

    r1158 r1166  
    271271 * Free variables and call finish(@p x).
    272272 */
    273 #define paranoid_MR_finish(x) {free_MR_global_filenames (); if (g_bkpinfo_DONTUSETHIS) mr_free (g_bkpinfo_DONTUSETHIS ); finish(x); }
     273#define paranoid_MR_finish(x) {free_MR_global_filenames (); if (bkpinfo) mr_free (bkpinfo); finish(x); }
    274274
    275275/**

  • branches/stable/mondo/src/mondorestore/mondo-restore-EXT.h

    r425 r1166  
    1212extern char *g_isodir_format;
    1313
    14 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
    1514extern char *g_biggielist_txt;
    1615extern char *g_filelist_full;
    … …  
    5453                                            long, char *, long long,
    5554                                            struct s_node *);
    56 extern int restore_a_tarball_from_CD(char *, int, struct s_node *);
     55extern int restore_a_tarball_from_CD(char *, int, struct s_node *, struct s_bkpinfo *);
    5756extern int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, int,
    5857                                         struct s_node *, long long);

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

    r1125 r1166  
    3838 **************************************************************************/
    3939extern char *g_tmpfs_mountpt;   // declared in libmondo-tools.c
    40 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS; // used by finish() to free
    41                                                 // up global bkpinfo struct
    4240extern bool g_text_mode;
    4341extern FILE *g_fprep;
    … …  
    15801578restore_a_tarball_from_CD(char *tarball_fname,
    15811579                          long current_tarball_number,
    1582                           struct s_node *filelist)
     1580                          struct s_node *filelist, struct s_bkpinfo *)
    15831581{
    15841582    int retval = 0;
    … …  
    22512249                    restore_a_tarball_from_CD(tarball_fname,
    22522250                                              current_tarball_number,
    2253                                               filelist);
     2251                                              filelist, bkpinfo);
    22542252            }
    22552253            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
    … …  
    29112909        g_text_mode = FALSE;
    29122910    }                           // newt :-)
    2913     bkpinfo = g_bkpinfo_DONTUSETHIS = mr_malloc(sizeof(struct s_bkpinfo));
     2911    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
    29142912    mountlist = mr_malloc(sizeof(struct mountlist_itself));
    29152913    raidlist = mr_malloc(sizeof(struct raidlist_itself));

  • branches/stable/mondo/src/mondorestore/mondo-restore.h

    r128 r1166  
    2727                                     char *, long long, struct s_node *,
    2828                                     int, char *);
    29 int restore_a_tarball_from_CD(char *, long, struct s_node *);
     29int restore_a_tarball_from_CD(char *, long, struct s_node *, struct s_bkpinfo *);
    3030int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, long,
    3131                                  struct s_node *, long long, char *,

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

    r1125 r1166  
    3737extern char *g_mountlist_fname; // where mountlist.txt (the mountlist file) is stored
    3838extern char *g_mondo_home;      // homedir of Mondo; usually /usr/local/share/mondo
    39 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
    4039
    4140extern t_bkptype g_backup_media_type;
    … …  
    20182017    log_to_screen
    20192018        ("Mondorestore is terminating in response to a signal from the OS");
    2020     paranoid_MR_finish(254);
     2019    free_MR_global_filenames();
     2020    finish(254);
    20212021}
    20222022
Note: See TracChangeset for help on using the changeset viewer.