From 62f8670d350b7ddd619536802a613a672e6a9f4a Mon Sep 17 00:00:00 2001 From: "Victor M. Alvarez" Date: Thu, 18 Jun 2015 14:05:45 +0200 Subject: [PATCH] Change --print-module-info to --print-module-data --- libyara/include/yara/scan.h | 2 +- libyara/rules.c | 2 +- yara.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libyara/include/yara/scan.h b/libyara/include/yara/scan.h index 4edf7390..ef85a160 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 SCAN_FLAGS_SHOW_MODULE_INFO 4 +#define SCAN_FLAGS_SHOW_MODULE_DATA 4 int yr_scan_verify_match( diff --git a/libyara/rules.c b/libyara/rules.c index 1ba03847..2bf421bf 100644 --- a/libyara/rules.c +++ b/libyara/rules.c @@ -478,7 +478,7 @@ _exit: _yr_rules_clean_matches(rules, &context); - if (flags & SCAN_FLAGS_SHOW_MODULE_INFO) + if (flags & SCAN_FLAGS_SHOW_MODULE_DATA) yr_modules_print_data(&context); yr_modules_unload_all(&context); diff --git a/yara.c b/yara.c index 6786f253..3c4ddb86 100644 --- a/yara.c +++ b/yara.c @@ -94,7 +94,7 @@ char* ext_vars[MAX_ARGS_EXT_VAR + 1]; char* modules_data[MAX_ARGS_EXT_VAR + 1]; int recursive_search = FALSE; -int show_module_info = FALSE; +int show_module_data = FALSE; int show_tags = FALSE; int show_specified_tags = FALSE; int show_specified_rules = FALSE; @@ -127,8 +127,8 @@ args_option_t options[] = OPT_BOOLEAN('n', "negate", &negate, "print only not satisfied rules (negate)", NULL), - OPT_BOOLEAN('D', "print-module-info", &show_module_info, - "print module information"), + OPT_BOOLEAN('D', "print-module-data", &show_module_data, + "print module data"), OPT_BOOLEAN('g', "print-tags", &show_tags, "print tags"), @@ -648,8 +648,8 @@ void* scanning_thread(void* param) if (fast_scan) flags |= SCAN_FLAGS_FAST_MODE; - if (show_module_info) - flags |= SCAN_FLAGS_SHOW_MODULE_INFO; + if (show_module_data) + flags |= SCAN_FLAGS_SHOW_MODULE_DATA; while (file_path != NULL) { @@ -1000,8 +1000,8 @@ int main( if (fast_scan) flags |= SCAN_FLAGS_FAST_MODE; - if (show_module_info) - flags |= SCAN_FLAGS_SHOW_MODULE_INFO; + if (show_module_data) + flags |= SCAN_FLAGS_SHOW_MODULE_DATA; result = yr_rules_scan_proc( rules, @@ -1064,8 +1064,8 @@ int main( if (fast_scan) flags |= SCAN_FLAGS_FAST_MODE; - if (show_module_info) - flags |= SCAN_FLAGS_SHOW_MODULE_INFO; + if (show_module_data) + flags |= SCAN_FLAGS_SHOW_MODULE_DATA; result = yr_rules_scan_file( rules,