darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-18 22:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix getline usage in main.c, fix WARN_VOID_VARIABLE -> WARN_VOID_VARIABLES in main.c

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-21 16:05:10 +02:00
parent 19b66800ae
commit 3cd1d19a7e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main.c
View file

@ -343,16 +343,15 @@ static void options_set(uint32_t *flags, size_t idx, bool on)
} }
/* returns the line number, or -1 on error */ /* returns the line number, or -1 on error */
static bool progs_nextline(char **out, FILE *src) static bool progs_nextline(char **out, size_t *alen,FILE *src)
{ {
size_t alen;
int len; int len;
char *line; char *line;
char *start; char *start;
char *end; char *end;
line = *out; line = *out;
len = util_getline(&line, &alen, src); len = util_getline(&line, alen, src);
if (len == -1) if (len == -1)
return false; return false;
@ -385,7 +384,7 @@ int main(int argc, char **argv) {
options_set(opts_warn, WARN_MISSING_RETURN_VALUES, true); options_set(opts_warn, WARN_MISSING_RETURN_VALUES, true);
options_set(opts_warn, WARN_USED_UNINITIALIZED, true); options_set(opts_warn, WARN_USED_UNINITIALIZED, true);
options_set(opts_warn, WARN_LOCAL_CONSTANTS, true); options_set(opts_warn, WARN_LOCAL_CONSTANTS, true);
options_set(opts_warn, WARN_VOID_VARIABLE, true); options_set(opts_warn, WARN_VOID_VARIABLES, true);
if (!options_parse(argc, argv)) { if (!options_parse(argc, argv)) {
return usage(); return usage();
@ -432,6 +431,7 @@ int main(int argc, char **argv) {
} else { } else {
FILE *src; FILE *src;
char *line; char *line;
size_t linelen = 0;
printf("Mode: progs.src\n"); printf("Mode: progs.src\n");
src = util_fopen("progs.src", "rb"); src = util_fopen("progs.src", "rb");
@ -442,7 +442,7 @@ int main(int argc, char **argv) {
} }
line = NULL; line = NULL;
if (!progs_nextline(&line, src) || !line[0]) { if (!progs_nextline(&line, &linelen, src) || !line[0]) {
printf("illformatted progs.src file: expected output filename in first line\n"); printf("illformatted progs.src file: expected output filename in first line\n");
retval = 1; retval = 1;
goto srcdone; goto srcdone;
@ -453,7 +453,7 @@ int main(int argc, char **argv) {
opts_output_free = true; opts_output_free = true;
} }
while (progs_nextline(&line, src)) { while (progs_nextline(&line, &linelen, src)) {
if (!line[0] || (line[0] == '/' && line[1] == '/')) if (!line[0] || (line[0] == '/' && line[1] == '/'))
continue; continue;
printf(" src: %s\n", line); printf(" src: %s\n", line);