Changeset 1543


Ignore:
Timestamp:
Jul 23, 2007, 1:05:36 AM (12 years ago)
Author:
bruno
Message:

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

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

Legend:

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

    r1535 r1543  
    2626#include "mr_str.h"
    2727#include "mr_file.h"
     28#include "mr_gettext.h"
    2829
    2930#include "libmondo-string-EXT.h"
     
    4142#define DVDRWFORMAT 1
    4243
    43 extern struct mr_ar_conf mr_conf;
     44extern struct mr_ar_conf *mr_conf;
    4445
    4546
  • branches/stable/mondo/src/common/libmondo-devices.c

    r1529 r1543  
    1717#include "libmondo-fork-EXT.h"
    1818#include "libmondo-stream-EXT.h"
     19
    1920#include "mr_mem.h"
    2021#include "mr_msg.h"
    2122#include "mr_str.h"
     23#include "mr_gettext.h"
    2224
    2325#include <sys/ioctl.h>
  • branches/stable/mondo/src/common/libmondo-fifo.c

    r1344 r1543  
    3232#include "mr_mem.h"
    3333#include "mr_msg.h"
     34#include "mr_gettext.h"
    3435
    3536/**
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1478 r1543  
    1616#include "newt-specific-EXT.h"
    1717#include "libmondo-tools-EXT.h"
     18
    1819#include "mr_str.h"
    1920#include "mr_mem.h"
    2021#include "mr_msg.h"
     22#include "mr_gettext.h"
    2123
    2224#include <time.h>
     
    157159
    158160    if (!does_file_exist(orig_fname)) {
    159         log_msg(2, "file %s empty", orig_fname);
     161        mr_msg(2, "file %s empty", orig_fname);
    160162        return (0);
    161163    }                           // no sense in trying to sort an empty file
  • branches/stable/mondo/src/common/libmondo-files.c

    r1508 r1543  
    2222#include "mr_msg.h"
    2323#include "mr_file.h"
     24#include "mr_gettext.h"
    2425
    2526/*@unused@*/
  • 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.