From e68692636e09a473bb19568cf6f1f81189bd8564 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 17 Apr 2008 23:15:04 +0000 Subject: [PATCH] Code cleanup --- src/configure.c | 6 ++++-- src/makefile.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/configure.c b/src/configure.c index 88464fa..16f2281 100644 --- a/src/configure.c +++ b/src/configure.c @@ -245,7 +245,8 @@ static int _load_subdirs(Prefs * prefs, char const * directory, char c; String * subdir; - subdir = subdirs; + if((subdir = string_new(subdirs)) == NULL) + return 1; for(i = 0; ret == 0; i++) { if(subdir[i] != ',' && subdir[i] != '\0') @@ -256,9 +257,10 @@ static int _load_subdirs(Prefs * prefs, char const * directory, if(c == '\0') break; subdir[i] = c; - subdir+=i+1; + subdir += i + 1; i = 0; } + string_delete(subdir); return ret; } diff --git a/src/makefile.c b/src/makefile.c index 1343f7b..c49c8e2 100644 --- a/src/makefile.c +++ b/src/makefile.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "settings.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 _write_targets(Configure * configure, FILE * fp) { - char * targets = config_get(configure->config, "", "targets"); + int ret = 0; + char const * p; + char * targets; char c; int i; - int ret = 0; if(_targets_all(configure, fp) != 0 || _targets_subdirs(configure, fp) != 0) return 1; - if(targets == NULL) + if((p = config_get(configure->config, "", "targets")) == NULL) return 0; + if((targets = strdup(p)) == NULL) + return error_set_code(1, "%s", strerror(errno)); for(i = 0;; i++) { if(targets[i] != ',' && targets[i] != '\0') @@ -511,9 +515,10 @@ static int _write_targets(Configure * configure, FILE * fp) if(c == '\0') break; targets[i] = c; - targets+=i+1; + targets += i+1; i = 0; } + free(targets); return ret; }