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

Constifying

Browse Source
This commit is contained in:
Pierre Pronchery 2008-04-17 23:50:58 +00:00
parent 86961bb7bf
commit 75cae9ee82
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/configure.c
View File

@ -72,13 +72,13 @@ const struct HostKernel sHostKernel[] =
const String * sTargetType[TT_COUNT] = { "binary", "library", "object", NULL }; const String * sTargetType[TT_COUNT] = { "binary", "library", "object", NULL };
const String * sObjectType[OT_COUNT] = { "c", "cc", "cpp", "S", NULL }; const String * sObjectType[OT_COUNT] = { "c", "cc", "cpp", "S", NULL };
String * _source_extension(String * source) String const * _source_extension(String const * source)
{ {
int len; size_t len;
for(len = string_length(source)-1; len >= 0; len--) for(len = string_length(source); len > 0; len--)
if(source[len] == '.') if(source[len - 1] == '.')
return &source[len+1]; return &source[len];
return NULL; return NULL;
} }

2
src/configure.h
View File

@ -82,7 +82,7 @@ typedef enum _ObjectType
# define OT_LAST OT_UNKNOWN # define OT_LAST OT_UNKNOWN
# define OT_COUNT (OT_LAST + 1) # define OT_COUNT (OT_LAST + 1)
extern const String * sObjectType[OT_COUNT]; extern const String * sObjectType[OT_COUNT];
String * _source_extension(String * source); String const * _source_extension(String const * source);
/* constants */ /* constants */

34
src/makefile.c
View File

@ -630,7 +630,7 @@ static int _target_objs(Configure * configure, FILE * fp,
static int _objs_source(Prefs * prefs, FILE * fp, String * source) static int _objs_source(Prefs * prefs, FILE * fp, String * source)
{ {
int ret = 0; int ret = 0;
String * extension; String const * extension;
size_t len; size_t len;
if((extension = _source_extension(source)) == NULL) if((extension = _source_extension(source)) == NULL)
@ -809,8 +809,8 @@ static int _target_library(Configure * configure, FILE * fp,
static int _target_object(Configure * configure, FILE * fp, static int _target_object(Configure * configure, FILE * fp,
String const * target) String const * target)
{ {
String * p; String const * p;
String * extension; String const * extension;
if((p = config_get(configure->config, target, "sources")) == NULL) if((p = config_get(configure->config, target, "sources")) == NULL)
{ {
@ -870,13 +870,16 @@ static int _objects_target(Configure * configure, FILE * fp,
String const * target); String const * target);
static int _write_objects(Configure * configure, FILE * fp) static int _write_objects(Configure * configure, FILE * fp)
{ {
char * targets = config_get(configure->config, "", "targets"); String const * p;
String * targets;
char c; char c;
int i; size_t i;
int ret = 0; int ret = 0;
if(targets == NULL) if((p = config_get(configure->config, "", "targets")) == NULL)
return 0; return 0;
if((targets = string_new(p)) == NULL)
return 1;
for(i = 0;; i++) for(i = 0;; i++)
{ {
if(targets[i] != ',' && targets[i] != '\0') if(targets[i] != ',' && targets[i] != '\0')
@ -886,10 +889,10 @@ static int _write_objects(Configure * configure, FILE * fp)
ret += _objects_target(configure, fp, targets); ret += _objects_target(configure, fp, targets);
if(c == '\0') if(c == '\0')
break; break;
targets[i] = c; targets += i + 1;
targets+=i+1;
i = 0; i = 0;
} }
string_delete(targets);
return ret; return ret;
} }
@ -899,7 +902,7 @@ static int _objects_target(Configure * configure, FILE * fp,
String const * target) String const * target)
{ {
String * sources; String * sources;
int i; size_t i;
char c; char c;
if((sources = config_get(configure->config, target, "sources")) == NULL) if((sources = config_get(configure->config, target, "sources")) == NULL)
@ -1008,7 +1011,7 @@ static int _target_source(Configure * configure, FILE * fp,
static void _source_depends(Config * config, FILE * fp, String const * source) static void _source_depends(Config * config, FILE * fp, String const * source)
{ {
String * depends; String * depends;
int i; size_t i;
char c; char c;
if((depends = config_get(config, source, "depends")) == NULL) if((depends = config_get(config, source, "depends")) == NULL)
@ -1042,12 +1045,15 @@ static int _write_clean(Configure * configure, FILE * fp)
static int _clean_targets(Config * config, FILE * fp) static int _clean_targets(Config * config, FILE * fp)
{ {
String const * p;
String * targets; String * targets;
int i; int i;
char c; char c;
if((targets = config_get(config, "", "targets")) == NULL) if((p = config_get(config, "", "targets")) == NULL)
return 0; return 0;
if((targets = string_new(p)) == NULL)
return 1;
fputs("\t$(RM)", fp); fputs("\t$(RM)", fp);
for(i = 0;; i++) for(i = 0;; i++)
{ {
@ -1058,17 +1064,17 @@ static int _clean_targets(Config * config, FILE * fp)
fprintf(fp, "%s%s%s", " $(", targets, "_OBJS)"); fprintf(fp, "%s%s%s", " $(", targets, "_OBJS)");
if(c == '\0') if(c == '\0')
break; break;
targets[i] = c; targets += i+1;
targets+=i+1;
i = 0; i = 0;
} }
fputc('\n', fp); fputc('\n', fp);
string_delete(targets);
return 0; return 0;
} }
static int _write_distclean(Configure * configure, FILE * fp) static int _write_distclean(Configure * configure, FILE * fp)
{ {
String * subdirs; String const * subdirs;
if(configure->prefs->flags & PREFS_n) if(configure->prefs->flags & PREFS_n)
return 0; return 0;