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-04-17 23:15:04 +00:00
parent 22d65f69a3
commit e68692636e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/configure.c
View File

@ -245,7 +245,8 @@ static int _load_subdirs(Prefs * prefs, char const * directory,
char c; char c;
String * subdir; String * subdir;
subdir = subdirs; if((subdir = string_new(subdirs)) == NULL)
return 1;
for(i = 0; ret == 0; i++) for(i = 0; ret == 0; i++)
{ {
if(subdir[i] != ',' && subdir[i] != '\0') if(subdir[i] != ',' && subdir[i] != '\0')
@ -256,9 +257,10 @@ static int _load_subdirs(Prefs * prefs, char const * directory,
if(c == '\0') if(c == '\0')
break; break;
subdir[i] = c; subdir[i] = c;
subdir+=i+1; subdir += i + 1;
i = 0; i = 0;
} }
string_delete(subdir);
return ret; return ret;
} }

13
src/makefile.c
View File

@ -20,6 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include "settings.h" #include "settings.h"
#include "configure.h" #include "configure.h"
@ -491,16 +492,19 @@ static int _targets_subdirs(Configure * configure, FILE * fp);
static int _targets_target(Configure * configure, FILE * fp, String * target); static int _targets_target(Configure * configure, FILE * fp, String * target);
static int _write_targets(Configure * configure, FILE * fp) static int _write_targets(Configure * configure, FILE * fp)
{ {
char * targets = config_get(configure->config, "", "targets"); int ret = 0;
char const * p;
char * targets;
char c; char c;
int i; int i;
int ret = 0;
if(_targets_all(configure, fp) != 0 if(_targets_all(configure, fp) != 0
|| _targets_subdirs(configure, fp) != 0) || _targets_subdirs(configure, fp) != 0)
return 1; return 1;
if(targets == NULL) if((p = config_get(configure->config, "", "targets")) == NULL)
return 0; return 0;
if((targets = strdup(p)) == NULL)
return error_set_code(1, "%s", strerror(errno));
for(i = 0;; i++) for(i = 0;; i++)
{ {
if(targets[i] != ',' && targets[i] != '\0') if(targets[i] != ',' && targets[i] != '\0')
@ -511,9 +515,10 @@ static int _write_targets(Configure * configure, FILE * fp)
if(c == '\0') if(c == '\0')
break; break;
targets[i] = c; targets[i] = c;
targets+=i+1; targets += i+1;
i = 0; i = 0;
} }
free(targets);
return ret; return ret;
} }