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

Fixed the line count

Browse Source
This commit is contained in:
Pierre Pronchery 2009-08-02 03:30:13 +00:00
parent 8ae3a7622b
commit e5b7c501ba
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/config.c
View File

@ -134,7 +134,7 @@ static String * _load_value(FILE * fp);
int config_load(Config * config, char const * filename) int config_load(Config * config, char const * filename)
{ {
int ret = 0; int ret = 0;
size_t line = 1; size_t line;
FILE * fp; FILE * fp;
String * section; String * section;
String * variable = NULL; String * variable = NULL;
@ -148,7 +148,7 @@ int config_load(Config * config, char const * filename)
string_delete(section); string_delete(section);
return error_set_code(1, "%s: %s", filename, strerror(errno)); return error_set_code(1, "%s: %s", filename, strerror(errno));
} }
while((c = fgetc(fp)) != EOF) for(line = 0; (c = fgetc(fp)) != EOF; line++)
if(c == '#') if(c == '#')
while((c = fgetc(fp)) != EOF && c != '\n'); while((c = fgetc(fp)) != EOF && c != '\n');
else if(c == '[') else if(c == '[')
@ -170,9 +170,7 @@ int config_load(Config * config, char const * filename)
config_set(config, section, variable, str); config_set(config, section, variable, str);
string_delete(str); string_delete(str);
} }
else if(c == '\n') else if(c != '\n')
line++;
else
break; break;
string_delete(section); string_delete(section);
string_delete(variable); string_delete(variable);