[augeas-devel] augeas: master - * src/lexer.l: print into struct error instead of stderr
David Lutterkort
lutter at fedoraproject.org
Thu Oct 1 00:23:56 UTC 2009
Gitweb: http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=22da085bfe7aa012965e807c4dbca89e19085d69
Commit: 22da085bfe7aa012965e807c4dbca89e19085d69
Parent: a7d65f1f7948b1b3bb990553f809cd039c2eecf8
Author: David Lutterkort <lutter at redhat.com>
AuthorDate: Wed Sep 30 17:01:30 2009 -0700
Committer: David Lutterkort <lutter at redhat.com>
CommitterDate: Wed Sep 30 17:20:39 2009 -0700
* src/lexer.l: print into struct error instead of stderr
---
src/lexer.l | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/lexer.l b/src/lexer.l
index bbadf64..a62d2c7 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -123,7 +123,10 @@ ARROW ->
BEGIN(COMMENT);
}
. {
- fprintf(stderr, "%s:%d:%d: Unexpected character %c\n", augl_get_extra(yyscanner)->filename->str, yylineno, yylloc->first_column, yytext[0]);
+ report_error(augl_get_extra(yyscanner)->error, AUG_ESYNTAX,
+ "%s:%d:%d: Unexpected character %c",
+ augl_get_extra(yyscanner)->filename->str,
+ yylineno, yylloc->first_column, yytext[0]);
}
<<EOF>> {
@@ -145,7 +148,10 @@ ARROW ->
}
. /* Skip */;
<<EOF>> {
- fprintf(stderr, "%s:%d:%d: Missing *)\n", augl_get_extra(yyscanner)->filename->str, yylineno, yylloc->first_column);
+ report_error(augl_get_extra(yyscanner)->error, AUG_ESYNTAX,
+ "%s:%d:%d: Missing *)",
+ augl_get_extra(yyscanner)->filename->str,
+ yylineno, yylloc->first_column, yytext[0]);
yyterminate();
}
}
@@ -159,10 +165,8 @@ int augl_init_lexer(struct info *info, yyscan_t *scanner) {
if (f == NULL)
return -1;
- if (augl_lex_init(scanner) != 0) {
- fprintf(stderr, "Failed to init scanner\n");
+ if (augl_lex_init(scanner) != 0)
return -1;
- }
augl_set_extra(info, *scanner);
augl_set_in(f, *scanner);
return 0;
More information about the augeas-devel
mailing list