Ignore:
Timestamp:
Jul 23, 2007, 1:05:36 AM (13 years ago)
Author:
Bruno Cornec
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/mondoarchive/mondoarchive.c

    r1535 r1543  
    5555static char *g_dvd_drive_is_here = NULL;
    5656
    57 struct mr_ar_conf mr_conf;
     57struct mr_ar_conf *mr_conf = NULL;
    5858
    5959/***************** global vars ******************/
     
    257257    mr_free(mr_cnf->tmp_dir);
    258258    mr_free(mr_cnf->images_dir);
     259    mr_free(mr_cnf);
    259260}
    260261
     
    270271    /* Highly incomplete function for the moment */
    271272    /* We have to free all allocated memory */
    272     mr_ar_clean_conf(&mr_conf);
     273    mr_ar_clean_conf(mr_conf);
    273274    /* We have to remove all temporary files */
    274275    /* We have to unmount what has been mounted */
     
    332333            mr_log_exit(-1, "Unable to open "MONDO_CONF_DIR"/mondo.conf.dist");
    333334    }
    334     mr_ar_store_conf(&mr_conf);
     335    mr_conf = malloc(sizeof(struct mr_ar_conf));
     336    mr_ar_store_conf(mr_conf);
    335337    /* Reference the right cleanup function for mr_exit now it's allocated */
    336338    mr_cleanup = &mr_ar_cleanup;
     
    345347            mr_log_exit(-1, "Unable to open "MINDI_CONF_DIR"/mindi.conf.dist");
    346348    }
    347     mr_ar_store_conf_mindi(&mr_conf);
     349    mr_ar_store_conf_mindi(mr_conf);
    348350    mr_conf_close();
    349351
    350352    if (mr_conf_open(MINDI_CONF_DIR"/mindi.conf") == 0) {
    351         mr_ar_store_conf_mindi(&mr_conf);
     353        mr_ar_store_conf_mindi(mr_conf);
    352354        mr_conf_close();
    353355    }
Note: See TracChangeset for help on using the changeset viewer.