emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix up callsites of config_read to check for >= 0

Browse Source
This commit is contained in:
Denis Vlasenko 2008-07-16 23:04:49 +00:00
parent c01340fe26
commit fb1642f2ca
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libbb/parse_config.c
View File

@ -19,7 +19,7 @@ Typical usage:
// open file // open file
if (config_open(filename, &p)) { if (config_open(filename, &p)) {
// parse line-by-line // parse line-by-line
while (*config_read(&p, t, 3, 0, delimiters, comment_char)) { // 0..3 tokens while (*config_read(&p, t, 3, 0, delimiters, comment_char) >= 0) { // 0..3 tokens
// use tokens // use tokens
bb_error_msg("TOKENS: [%s][%s][%s]", t[0], t[1], t[2]); bb_error_msg("TOKENS: [%s][%s][%s]", t[0], t[1], t[2]);
} }
@ -77,7 +77,7 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, int ntokens, int mint
//TODO: speed up xmalloc_fgetline by internally using fgets, not fgetc //TODO: speed up xmalloc_fgetline by internally using fgets, not fgetc
line = xmalloc_fgetline(parser->fp); line = xmalloc_fgetline(parser->fp);
if (!line) if (!line)
return line; return -1;
parser->lineno++; parser->lineno++;
// handle continuations. Tito's code stolen :) // handle continuations. Tito's code stolen :)

2
miscutils/crond.c
View File

@ -468,7 +468,7 @@ static void SynchronizeFile(const char *fileName)
file->cf_User = xstrdup(fileName); file->cf_User = xstrdup(fileName);
pline = &file->cf_LineBase; pline = &file->cf_LineBase;
while (--maxLines && (n=config_read(&parser, tokens, 6, 0, " \t", '#')) > 0) { while (--maxLines && (n=config_read(&parser, tokens, 6, 0, " \t", '#')) >= 0) {
CronLine *line; CronLine *line;
if (DebugOpt) { if (DebugOpt) {

2
networking/nameif.c
View File

@ -163,7 +163,7 @@ int nameif_main(int argc, char **argv)
struct parser_t parser; struct parser_t parser;
if (config_open(&parser, fname)) { if (config_open(&parser, fname)) {
char *tokens[2]; char *tokens[2];
while (config_read(&parser, tokens, 2, 2, " \t", '#')) while (config_read(&parser, tokens, 2, 2, " \t", '#') >= 0)
prepend_new_eth_table(&clist, tokens[0], tokens[1]); prepend_new_eth_table(&clist, tokens[0], tokens[1]);
config_close(&parser); config_close(&parser);
} }

2
util-linux/mdev.c
View File

@ -101,7 +101,7 @@ static void make_device(char *path, int delete)
if (!config_open(&parser, "/etc/mdev.conf")) if (!config_open(&parser, "/etc/mdev.conf"))
goto end_parse; goto end_parse;
while (config_read(&parser, tokens, 4, 3, " \t", '#')) { while (config_read(&parser, tokens, 4, 3, " \t", '#') >= 0) {
regmatch_t off[1+9*ENABLE_FEATURE_MDEV_RENAME_REGEXP]; regmatch_t off[1+9*ENABLE_FEATURE_MDEV_RENAME_REGEXP];
char *val; char *val;