DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2017-11-18 00:35:35 +01:00
parent 694c23de2b
commit 790a0e549f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/configure.c
View File

@ -63,7 +63,7 @@ struct _Configure {
HostArch arch; HostArch arch;
HostOS os; HostOS os;
HostKernel kernel; HostKernel kernel;
Config * programs; Config * config;
}; };
@ -258,8 +258,8 @@ int configure(ConfigurePrefs * prefs, String const * directory)
config_delete(p); config_delete(p);
} }
array_delete(ca); array_delete(ca);
if(cfgr.programs != NULL) if(cfgr.config != NULL)
config_delete(cfgr.programs); config_delete(cfgr.config);
return ret; return ret;
} }
@ -339,10 +339,10 @@ static int _configure_detect_programs(Configure * configure)
}; };
size_t i; size_t i;
if((configure->programs = config_new()) == NULL) if((configure->config = config_new()) == NULL)
return -1; return -1;
for(i = 0; i < sizeof(programs) / sizeof(*programs); i++) for(i = 0; i < sizeof(programs) / sizeof(*programs); i++)
if(config_set(configure->programs, section, programs[i].name, if(config_set(configure->config, section, programs[i].name,
programs[i].program) != 0) programs[i].program) != 0)
return -1; return -1;
/* load the global database */ /* load the global database */
@ -352,7 +352,7 @@ static int _configure_detect_programs(Configure * configure)
"/data/" PACKAGE ".conf", "/data/" PACKAGE ".conf",
NULL)) == NULL) NULL)) == NULL)
return -configure_error(1, "%s", error_get(NULL)); return -configure_error(1, "%s", error_get(NULL));
if(filename != NULL && config_load(configure->programs, filename) != 0) if(filename != NULL && config_load(configure->config, filename) != 0)
configure_warning(0, "%s: %s", filename, configure_warning(0, "%s: %s", filename,
"Could not load program definitions"); "Could not load program definitions");
if(configure->prefs->basedir != NULL) if(configure->prefs->basedir != NULL)
@ -367,7 +367,7 @@ static int _configure_detect_programs(Configure * configure)
sHostOS[configure->os], ".conf", NULL); sHostOS[configure->os], ".conf", NULL);
if(filename == NULL) if(filename == NULL)
return -configure_error(1, "%s", error_get(NULL)); return -configure_error(1, "%s", error_get(NULL));
else if(config_load(configure->programs, filename) != 0) else if(config_load(configure->config, filename) != 0)
configure_warning(0, "%s: %s", filename, configure_warning(0, "%s: %s", filename,
"Could not load program definitions"); "Could not load program definitions");
string_delete(filename); string_delete(filename);
@ -507,7 +507,7 @@ String const * configure_get_extension(Configure * configure,
{ {
String const section[] = "extensions"; String const section[] = "extensions";
return config_get(configure->programs, section, extension); return config_get(configure->config, section, extension);
} }
@ -531,7 +531,7 @@ String const * configure_get_program(Configure * configure, String const * name)
String const section[] = "programs"; String const section[] = "programs";
String const * program; String const * program;
if((program = config_get(configure->programs, section, name)) != NULL) if((program = config_get(configure->config, section, name)) != NULL)
return program; return program;
return name; return name;
} }