summaryrefslogtreecommitdiff
path: root/parseutils.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-11-01 16:37:03 +1100
committerDaniel Stone <daniel@fooishbar.org>2012-11-01 16:37:03 +1100
commita68c5b7b29eb1433b1be73b50c4248e10eab8e64 (patch)
treea02314bd93b42d550e30a1eac435a3a0180322c3 /parseutils.c
parente119cbec7e750ffc4d4bd08b577db2c697035a30 (diff)
Reset scan state when opening a new file
When we opened a new file after encountering a parse error, we weren't resetting our scan state, and continued to read out of the old buffer rather than that of the new file. Fixes a regression introduced in 9887842e ('Use fread() instead of getc()'). Test case: xkbcomp -lfhlpR "path/to/xkeyboard-config.git/symbols/*" The Makefiles in that tree would cause parse errors, the resulting directory file is incomplete (down from ~12000 to ~230 lines). Reported-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'parseutils.c')
-rw-r--r--parseutils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/parseutils.c b/parseutils.c
index 253cd9d..a1b6e9e 100644
--- a/parseutils.c
+++ b/parseutils.c
@@ -797,7 +797,7 @@ XKBParseFile(FILE * file, XkbFile ** pRtrn)
{
if (file)
{
- yyin = file;
+ scan_set_file(file);
rtrnValue = NULL;
if (yyparse() == 0)
{