[Forensics-changes] [yara] 67/415: Functions renamed to avoid name conflict in c-icap-server YARA module

[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 0d3b7724b1d865c948826ff8a809ace16bdf5ecb
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Sun Oct 24 16:36:09 2010 +0000

    Functions renamed to avoid name conflict in c-icap-server YARA module
---
 libyara/lex.c     | 6 +++---
 libyara/lex.h     | 4 ++--
 libyara/lex.l     | 6 +++---
 libyara/libyara.c | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libyara/lex.c b/libyara/lex.c
index d70db29..4734959 100644
--- a/libyara/lex.c
+++ b/libyara/lex.c
@@ -2826,7 +2826,7 @@ void yyerror(yyscan_t yyscanner, const char *error_message)
 
 
 
-int parse_string(const char* string, YARA_CONTEXT* context)
+int parse_rules_string(const char* rules_string, YARA_CONTEXT* context)
 {
 	yyscan_t yyscanner;
 	YY_BUFFER_STATE state;
@@ -2835,7 +2835,7 @@ int parse_string(const char* string, YARA_CONTEXT* context)
 
 	yyset_extra(context,yyscanner);
 
-	state = yy_scan_string(string,yyscanner);
+	state = yy_scan_string(rules_string,yyscanner);
 	
 	yyset_lineno(1,yyscanner);
     yyparse(yyscanner);
@@ -2847,7 +2847,7 @@ int parse_string(const char* string, YARA_CONTEXT* context)
 
 
 
-int parse_file(FILE* rules_file, YARA_CONTEXT* context)
+int parse_rules_file(FILE* rules_file, YARA_CONTEXT* context)
 {	
 	yyscan_t yyscanner;	
 	
diff --git a/libyara/lex.h b/libyara/lex.h
index 2b54591..df7e5fa 100644
--- a/libyara/lex.h
+++ b/libyara/lex.h
@@ -28,5 +28,5 @@ void yyerror(yyscan_t yyscanner, const char *error_message);
 
 YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner);
 
-int parse_string(const char* string, YARA_CONTEXT* context);
-int parse_file(FILE* rules_file, YARA_CONTEXT* context);
\ No newline at end of file
+int parse_rules_string(const char* rules_string, YARA_CONTEXT* context);
+int parse_rules_file(FILE* rules_file, YARA_CONTEXT* context);
\ No newline at end of file
diff --git a/libyara/lex.l b/libyara/lex.l
index f05b305..301a1dd 100644
--- a/libyara/lex.l
+++ b/libyara/lex.l
@@ -438,7 +438,7 @@ void yyerror(yyscan_t yyscanner, const char *error_message)
 
 
 
-int parse_string(const char* string, YARA_CONTEXT* context)
+int parse_rules_string(const char* rules_string, YARA_CONTEXT* context)
 {
 	yyscan_t yyscanner;
 	YY_BUFFER_STATE state;
@@ -447,7 +447,7 @@ int parse_string(const char* string, YARA_CONTEXT* context)
 
 	yyset_extra(context, yyscanner);
 
-	state = yy_scan_string(string, yyscanner);
+	state = yy_scan_string(rules_string, yyscanner);
 	
 	yyset_lineno(1, yyscanner);
     yyparse(yyscanner);
@@ -459,7 +459,7 @@ int parse_string(const char* string, YARA_CONTEXT* context)
 
 
 
-int parse_file(FILE* rules_file, YARA_CONTEXT* context)
+int parse_rules_file(FILE* rules_file, YARA_CONTEXT* context)
 {	
 	yyscan_t yyscanner;	
 	
diff --git a/libyara/libyara.c b/libyara/libyara.c
index 4090223..eaf7ac5 100644
--- a/libyara/libyara.c
+++ b/libyara/libyara.c
@@ -340,12 +340,12 @@ void yr_pop_file_name(YARA_CONTEXT* context)
 
 int yr_compile_file(FILE* rules_file, YARA_CONTEXT* context)
 {	
-    return parse_file(rules_file, context);
+    return parse_rules_file(rules_file, context);
 }
 
 int yr_compile_string(const char* rules_string, YARA_CONTEXT* context)
 {	
-    return parse_string(rules_string, context);
+    return parse_rules_string(rules_string, context);
 }
 
 int yr_scan_mem(unsigned char* buffer, unsigned int buffer_size, YARA_CONTEXT* context, YARACALLBACK callback, void* user_data)

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