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 2008-06-10 16:10:01 +00:00
parent 220a4e1354
commit 88de208192
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/configure.c
View File

@ -28,10 +28,6 @@
#include "configure.h" #include "configure.h"
#include "../config.h" #include "../config.h"
#ifndef PACKAGE
# define PACKAGE "configure"
#endif
/* configure */ /* configure */
/* variables */ /* variables */
@ -120,6 +116,7 @@ static void _configure_detect(Configure * configure);
static int _configure_load(Prefs * prefs, char const * directory, static int _configure_load(Prefs * prefs, char const * directory,
configArray * ca); configArray * ca);
static int _configure_do(Configure * configure, configArray * ca); static int _configure_do(Configure * configure, configArray * ca);
static int _configure(Prefs * prefs, char const * directory) static int _configure(Prefs * prefs, char const * directory)
{ {
int ret; int ret;
@ -245,7 +242,7 @@ static int _load_subdirs(Prefs * prefs, char const * directory,
char c; char c;
String * subdir; String * subdir;
String * p; String * p;
if((subdir = string_new(subdirs)) == NULL) if((subdir = string_new(subdirs)) == NULL)
return 1; return 1;
p = subdir; p = subdir;
@ -294,11 +291,14 @@ static int _configure_do(Configure * configure, configArray * ca)
for(i = 0; i < cnt; i++) for(i = 0; i < cnt; i++)
{ {
array_get_copy(ca, i, &configure->config); array_get_copy(ca, i, &configure->config);
di = config_get(configure->config, "", "directory"); if((di = config_get(configure->config, "", "directory"))
== NULL)
continue;
for(j = i; j < cnt; j++) for(j = i; j < cnt; j++)
{ {
array_get_copy(ca, j, &cj); array_get_copy(ca, j, &cj);
dj = config_get(cj, "", "directory"); if((dj = config_get(cj, "", "directory")) == NULL)
continue;
if(string_find(dj, di) == NULL) if(string_find(dj, di) == NULL)
break; break;
} }