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:54:17 +00:00
parent 75cae9ee82
commit 4acbdeb142
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/makefile.c
View File

@ -1047,7 +1047,7 @@ static int _clean_targets(Config * config, FILE * fp)
{ {
String const * p; String const * p;
String * targets; String * targets;
int i; size_t i;
char c; char c;
if((p = config_get(config, "", "targets")) == NULL) if((p = config_get(config, "", "targets")) == NULL)
@ -1126,15 +1126,16 @@ static int _write_dist(Configure * configure, FILE * fp, configArray * ca,
return 0; return 0;
} }
static int _dist_subdir_dist(FILE * fp, String * path, String * dist); static int _dist_subdir_dist(FILE * fp, String const * path,
String const * dist);
static int _dist_subdir(Config * config, FILE * fp, Config * subdir) static int _dist_subdir(Config * config, FILE * fp, Config * subdir)
{ {
String * path; String const * path;
size_t len; size_t len;
String * targets; String * targets;
String * includes; String const * includes;
String * dist; String * dist;
int i; size_t i;
char c; char c;
path = config_get(config, "", "directory"); path = config_get(config, "", "directory");
@ -1170,26 +1171,31 @@ static int _dist_subdir(Config * config, FILE * fp, Config * subdir)
return 0; return 0;
} }
static int _dist_subdir_dist(FILE * fp, String * path, String * dist) static int _dist_subdir_dist(FILE * fp, String const * path,
String const * dist)
{ {
int i; String * d;
size_t i;
char c; char c;
if((d = string_new(dist)) == NULL)
return 1;
for(i = 0;; i++) for(i = 0;; i++)
{ {
if(dist[i] != ',' && dist[i] != '\0') if(d[i] != ',' && d[i] != '\0')
continue; continue;
c = dist[i]; c = d[i];
dist[i] = '\0'; d[i] = '\0';
fprintf(fp, "%s%s%s%s%s", "\t\t$(PACKAGE)-$(VERSION)/", fprintf(fp, "%s%s%s%s%s", "\t\t$(PACKAGE)-$(VERSION)/",
path[0] == '\0' ? "" : path, path[0] == '\0' ? "" : path,
path[0] == '\0' ? "" : "/", dist, " \\\n"); path[0] == '\0' ? "" : "/", d, " \\\n");
if(c == '\0') if(c == '\0')
break; break;
dist[i] = c; d[i] = c;
dist+=i+1; d += i + 1;
i = 0; i = 0;
} }
string_delete(d);
return 0; return 0;
} }