forked from github/server
new iniparser
This commit is contained in:
parent
e06352a242
commit
93f7c16def
|
@ -80,13 +80,13 @@ static void load_inifile(dictionary * d)
|
||||||
str = iniparser_getstring(d, "eressea:locales", "de,en");
|
str = iniparser_getstring(d, "eressea:locales", "de,en");
|
||||||
make_locales(str);
|
make_locales(str);
|
||||||
|
|
||||||
if (global.inifile) iniparser_free(global.inifile);
|
if (global.inifile) iniparser_freedict(global.inifile);
|
||||||
global.inifile = d;
|
global.inifile = d;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void parse_config(const char *filename)
|
static void parse_config(const char *filename)
|
||||||
{
|
{
|
||||||
dictionary *d = iniparser_new(filename);
|
dictionary *d = iniparser_load(filename);
|
||||||
if (d) {
|
if (d) {
|
||||||
load_inifile(d);
|
load_inifile(d);
|
||||||
log_debug("reading from configuration file %s\n", filename);
|
log_debug("reading from configuration file %s\n", filename);
|
||||||
|
@ -318,7 +318,7 @@ int main(int argc, char **argv)
|
||||||
lua_done(L);
|
lua_done(L);
|
||||||
log_close();
|
log_close();
|
||||||
if (global.inifile) {
|
if (global.inifile) {
|
||||||
iniparser_free(global.inifile);
|
iniparser_freedict(global.inifile);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue