Changeset 1626 for branches/stable


Ignore:
Timestamp:
Sep 9, 2007, 1:36:41 AM (12 years ago)
Author:
bruno
Message:

Fix the latest pb with mr_rs_conf and compilation works

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

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-fork.c

    r1625 r1626  
    2424extern char *MONDO_LOGFILE;
    2525pid_t g_buffer_pid = 0;
    26 extern struct mr_ar_conf *mr_conf = NULL;
     26extern struct mr_ar_conf *mr_conf;
    2727
    2828/**
  • branches/stable/mondo/src/mondoarchive/mondo-cli.c

    r1625 r1626  
    2929extern bool g_sigpipe;
    3030
    31 extern struct mr_ar_conf *mr_conf = NULL;
     31extern struct mr_ar_conf *mr_conf;
    3232
    3333/*@ file pointer **************************************************/
  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1625 r1626  
    3535
    3636extern void twenty_seconds_til_yikes(void);
    37 extern struct mr_ar_conf *mr_conf = NULL;
    38 
    3937
    4038/* For use in other programs (ex. XMondo) */
     
    134132                                 char direction);
    135133
    136 struct mr_rs_conf mr_conf;
     134struct mr_rs_conf *mr_conf = NULL;
    137135
    138136/* destroy the mr_rs_conf structure's content */
     
    167165
    168166    mr_msg_close();
     167}
     168
     169/* reset/empty the mr_ar_conf structure from mondo's conf file */
     170static void mr_rs_reset_conf(struct mr_rs_conf *mr_cnf) {
     171
     172    /* This should correspond to the default conf file */
     173    /* Especially for boolean values */
     174    mr_cnf->media_size = 0;
     175    mr_cnf->media_device = NULL;
     176    mr_cnf->manual_tray = FALSE;
     177    mr_cnf->log_level = 0;
     178    mr_cnf->prefix = NULL;
     179    mr_cnf->external_tape_blocksize = 0;
     180    mr_cnf->internal_tape_blocksize = 0;
     181    mr_cnf->slice_size = 0;
     182    mr_cnf->boot_loader = NULL;
     183    mr_cnf->differential = FALSE;
     184    mr_cnf->compression_tool = NULL;
     185    mr_cnf->ui_mode = NULL;
     186    mr_cnf->automatic_restore = FALSE;
     187    mr_cnf->images_dir = NULL;
    169188}
    170189
     
    28192838        mr_exit(127, NULL);
    28202839    }
     2840    /* Conf file management */
     2841    mr_conf = mr_malloc(sizeof(struct mr_rs_conf));
     2842    mr_rs_reset_conf(mr_conf);
    28212843
    28222844    mr_conf->log_level = DEFAULT_MR_LOGLEVEL;
Note: See TracChangeset for help on using the changeset viewer.