[Forensics-changes] [yara] 85/160: s/SHOW_MODULE_INFO/SCAN_FLAGS_SHOW_MODULE_INFO/

[Hilko Bengen]

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

bengen pushed a commit to annotated tag v3.4.0
in repository yara.

commit c71eb11f92e8cc5898eb7826dc8c12fff15dd488
Author: Wesley Shields <wxs at atarininja.org>
Date:   Tue Apr 21 13:47:04 2015 -0400

    s/SHOW_MODULE_INFO/SCAN_FLAGS_SHOW_MODULE_INFO/
    
    This is more in line with the other flag names.
---
 libyara/include/yara/scan.h | 2 +-
 libyara/rules.c             | 2 +-
 yara.c                      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libyara/include/yara/scan.h b/libyara/include/yara/scan.h
index 705f82d..29f53b2 100644
--- a/libyara/include/yara/scan.h
+++ b/libyara/include/yara/scan.h
@@ -22,7 +22,7 @@ limitations under the License.
 // Bitmasks for flags.
 #define SCAN_FLAGS_FAST_MODE         1
 #define SCAN_FLAGS_PROCESS_MEMORY    2
-#define SHOW_MODULE_INFO             4
+#define SCAN_FLAGS_SHOW_MODULE_INFO  4
 
 
 int yr_scan_verify_match(
diff --git a/libyara/rules.c b/libyara/rules.c
index 7894b0b..697e5e6 100644
--- a/libyara/rules.c
+++ b/libyara/rules.c
@@ -470,7 +470,7 @@ YR_API int yr_rules_scan_mem_blocks(
 
 _exit:
 
-  if (flags & SHOW_MODULE_INFO)
+  if (flags & SCAN_FLAGS_SHOW_MODULE_INFO)
     yr_modules_print_data(&context);
 
   yr_modules_unload_all(&context);
diff --git a/yara.c b/yara.c
index dc1fa16..9755d45 100644
--- a/yara.c
+++ b/yara.c
@@ -647,7 +647,7 @@ void* scanning_thread(void* param)
   if (fast_scan)
     flags |= SCAN_FLAGS_FAST_MODE;
   if (show_module_info)
-    flags |= SHOW_MODULE_INFO;
+    flags |= SCAN_FLAGS_SHOW_MODULE_INFO;
 
   while (file_path != NULL)
   {
@@ -998,7 +998,7 @@ int main(
     if (fast_scan)
       flags |= SCAN_FLAGS_FAST_MODE;
     if (show_module_info)
-      flags |= SHOW_MODULE_INFO;
+      flags |= SCAN_FLAGS_SHOW_MODULE_INFO;
 
     result = yr_rules_scan_proc(
         rules,
@@ -1060,7 +1060,7 @@ int main(
     if (fast_scan)
       flags |= SCAN_FLAGS_FAST_MODE;
     if (show_module_info)
-      flags |= SHOW_MODULE_INFO;
+      flags |= SCAN_FLAGS_SHOW_MODULE_INFO;
 
     result = yr_rules_scan_file(
         rules,

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