From 22d65f69a39c576852a46749bc35bc6be71bb45d Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 17 Apr 2008 23:08:30 +0000 Subject: [PATCH] Constifying --- src/configure.c | 8 ++++---- src/makefile.c | 2 +- src/makefile.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/configure.c b/src/configure.c index 418d14a..88464fa 100644 --- a/src/configure.c +++ b/src/configure.c @@ -201,14 +201,14 @@ static HostKernel _detect_kernel(HostOS os, char const * release) static int _load_subdirs(Prefs * prefs, char const * directory, - configArray * ca, String * subdirs); + configArray * ca, String const * subdirs); static int _configure_load(Prefs * prefs, String const * directory, configArray * ca) { int ret = 0; Config * config; String * path; - String * subdirs = NULL; + String const * subdirs = NULL; if((path = string_new(directory)) == NULL) return configure_error(directory, 1); @@ -238,7 +238,7 @@ static int _configure_load(Prefs * prefs, String const * directory, static int _load_subdirs_subdir(Prefs * prefs, char const * directory, configArray * ca, char const * subdir); static int _load_subdirs(Prefs * prefs, char const * directory, - configArray * ca, String * subdirs) + configArray * ca, String const * subdirs) { int ret = 0; int i; @@ -302,7 +302,7 @@ static int _configure_do(Configure * configure, configArray * ca) if(makefile(configure, di, ca, i, j) != 0) break; } - return i == cnt ? 0 : 1; + return (i == cnt) ? 0 : 1; } diff --git a/src/makefile.c b/src/makefile.c index a0c71d8..1343f7b 100644 --- a/src/makefile.c +++ b/src/makefile.c @@ -29,7 +29,7 @@ ARRAY(Config *, config); /* functions */ static int _makefile_write(Configure * configure, FILE * fp, configArray * ca, int from, int to); -int makefile(Configure * configure, String * directory, configArray * ca, +int makefile(Configure * configure, String const * directory, configArray * ca, int from, int to) { diff --git a/src/makefile.h b/src/makefile.h index 7fa2b9c..aa21f02 100644 --- a/src/makefile.h +++ b/src/makefile.h @@ -32,7 +32,7 @@ extern configArray * configarray_new(void); /* functions */ -int makefile(Configure * configure, String * directory, configArray * ca, +int makefile(Configure * configure, String const * directory, configArray * ca, int from, int to);