mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-30 23:53:32 +01:00
r13689@catbus: nickm | 2007-07-10 17:46:30 -0400
tweaks to last patch. from croup. svn:r10787
This commit is contained in:
parent
7e20fdbefb
commit
fa1376014b
@ -2365,7 +2365,7 @@ get_next_token(const char **s, const char *eos, token_rule_t *table)
|
||||
tok->tp = _ERR;
|
||||
|
||||
*s = eat_whitespace_eos(*s, eos);
|
||||
if (!**s) {
|
||||
if (*s == eos) {
|
||||
tok->tp = _EOF;
|
||||
return tok;
|
||||
}
|
||||
@ -2377,10 +2377,8 @@ get_next_token(const char **s, const char *eos, token_rule_t *table)
|
||||
if (!strncmp("opt", *s, next-*s)) {
|
||||
/* Skip past an "opt" at the start of the line. */
|
||||
*s = eat_whitespace_eos(next, eos);
|
||||
next = NULL;
|
||||
if (**s)
|
||||
next = find_whitespace_eos(*s, eos);
|
||||
if (!**s || !next) {
|
||||
next = find_whitespace_eos(*s, eos);
|
||||
if (!next) {
|
||||
RET_ERR("opt without keyword");
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user