[Forensics-changes] [yara] 292/415: Set a more meaningful name to struct field

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch debian
in repository yara.

commit 77dc656ab7fa03b843c3d7614923f1cadc75952f
Author: Victor Manuel Alvarez <vmalvarez at virustotal.com>
Date:   Thu Dec 5 18:33:28 2013 +0100

    Set a more meaningful name to struct field
---
 libyara/lexer.c | 6 +++---
 libyara/lexer.l | 6 +++---
 libyara/yara.h  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libyara/lexer.c b/libyara/lexer.c
index 5bd9d18..621ca7b 100644
--- a/libyara/lexer.c
+++ b/libyara/lexer.c
@@ -2841,7 +2841,7 @@ void yyfatal(
   YR_COMPILER* compiler = yara_yyget_extra(yyscanner);
 
   yyerror(yyscanner, error_message);
-  longjmp(compiler->fatal_error, 1);
+  longjmp(compiler->error_recovery, 1);
 }
 
 
@@ -2919,7 +2919,7 @@ int yr_lex_parse_rules_string(
   yyscan_t yyscanner;
   YY_BUFFER_STATE state;
 
-  if (setjmp(compiler->fatal_error) != 0)
+  if (setjmp(compiler->error_recovery) != 0)
     return compiler->errors;
 
   yara_yylex_init(&yyscanner);
@@ -2944,7 +2944,7 @@ int yr_lex_parse_rules_file(
 {
   yyscan_t yyscanner;
 
-  if (setjmp(compiler->fatal_error) != 0)
+  if (setjmp(compiler->error_recovery) != 0)
     return compiler->errors;
 
   yara_yylex_init(&yyscanner);
diff --git a/libyara/lexer.l b/libyara/lexer.l
index a3541bc..d346ceb 100644
--- a/libyara/lexer.l
+++ b/libyara/lexer.l
@@ -504,7 +504,7 @@ void yyfatal(
   YR_COMPILER* compiler = yyget_extra(yyscanner);
 
   yyerror(yyscanner, error_message);
-  longjmp(compiler->fatal_error, 1);
+  longjmp(compiler->error_recovery, 1);
 }
 
 
@@ -582,7 +582,7 @@ int yr_lex_parse_rules_string(
   yyscan_t yyscanner;
   YY_BUFFER_STATE state;
 
-  if (setjmp(compiler->fatal_error) != 0)
+  if (setjmp(compiler->error_recovery) != 0)
     return compiler->errors;
 
   yylex_init(&yyscanner);
@@ -607,7 +607,7 @@ int yr_lex_parse_rules_file(
 {
   yyscan_t yyscanner;
 
-  if (setjmp(compiler->fatal_error) != 0)
+  if (setjmp(compiler->error_recovery) != 0)
     return compiler->errors;
 
   yylex_init(&yyscanner);
diff --git a/libyara/yara.h b/libyara/yara.h
index 78ce28b..b0eec6c 100644
--- a/libyara/yara.h
+++ b/libyara/yara.h
@@ -507,7 +507,7 @@ typedef struct _YR_COMPILER
   int                 last_error;
   int                 last_error_line;
 
-  jmp_buf             fatal_error;
+  jmp_buf             error_recovery;
 
   YR_ARENA*           sz_arena;
   YR_ARENA*           rules_arena;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git