Implement yr_rules_foreach and use it where appropriate

1sn0m4d · Sep 18, 2014 · 55ee00d · 55ee00d
1 parent 6a1c56a
commit 55ee00d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 34 deletions.
diff --git a/libyara/include/yara/rules.h b/libyara/include/yara/rules.h
@@ -49,6 +49,10 @@ limitations under the License.
     for (match = STRING_MATCHES(string).head; match != NULL; match = match->next)
 
 
+#define yr_rules_foreach(rules, rule) \
+    for (rule = rules->rules_list_head; !RULE_IS_NULL(rule); rule++)
+
+
 
 int yr_rules_scan_mem(
     YR_RULES* rules,

diff --git a/libyara/rules.c b/libyara/rules.c
@@ -151,26 +151,20 @@ void _yr_rules_clean_matches(
 
   int tidx = yr_get_tidx();
 
-  rule = rules->rules_list_head;
-
-  while (!RULE_IS_NULL(rule))
+  yr_rules_foreach(rules, rule)
   {
     rule->t_flags[tidx] &= ~RULE_TFLAGS_MATCH;
     rule->ns->t_flags[tidx] &= ~NAMESPACE_TFLAGS_UNSATISFIED_GLOBAL;
-    string = rule->strings;
 
-    while (!STRING_IS_NULL(string))
+    yr_rule_strings_foreach(rule, string)
     {
       string->matches[tidx].count = 0;
       string->matches[tidx].head = NULL;
       string->matches[tidx].tail = NULL;
       string->unconfirmed_matches[tidx].count = 0;
       string->unconfirmed_matches[tidx].head = NULL;
       string->unconfirmed_matches[tidx].tail = NULL;
-      string++;
     }
-
-    rule++;
   }
 }
 
@@ -186,26 +180,20 @@ void yr_rules_print_profiling_info(
 
   printf("===== PROFILING INFORMATION =====\n");
 
-  rule = rules->rules_list_head;
-
-  while (!RULE_IS_NULL(rule))
+  yr_rules_foreach(rules, rule)
   {
     clock_ticks = rule->clock_ticks;
-    string = rule->strings;
 
-    while (!STRING_IS_NULL(string))
+    yr_rule_strings_foreach(rule, string)
     {
       clock_ticks += string->clock_ticks;
-      string++;
     }
 
     printf(
         "%s:%s: %li\n",
         rule->ns->name,
         rule->identifier,
         clock_ticks);
-
-    rule++;
   }
 
   printf("================================\n");
@@ -419,21 +407,15 @@ int yr_rules_scan_mem_blocks(
   if (result != ERROR_SUCCESS)
     goto _exit;
 
-  rule = rules->rules_list_head;
-
-  while (!RULE_IS_NULL(rule))
+  yr_rules_foreach(rules, rule)
   {
     if (RULE_IS_GLOBAL(rule) && !(rule->t_flags[tidx] & RULE_TFLAGS_MATCH))
     {
       rule->ns->t_flags[tidx] |= NAMESPACE_TFLAGS_UNSATISFIED_GLOBAL;
     }
-
-    rule++;
   }
 
-  rule = rules->rules_list_head;
-
-  while (!RULE_IS_NULL(rule))
+  yr_rules_foreach(rules, rule)
   {
     if (rule->t_flags[tidx] & RULE_TFLAGS_MATCH &&
         !(rule->ns->t_flags[tidx] & NAMESPACE_TFLAGS_UNSATISFIED_GLOBAL))
@@ -458,8 +440,6 @@ int yr_rules_scan_mem_blocks(
           goto _exit;
       }
     }
-
-    rule++;
   }
 
   callback(CALLBACK_MSG_SCAN_FINISHED, NULL, user_data);

diff --git a/yara-python/yara-python.c b/yara-python/yara-python.c
@@ -1162,26 +1162,20 @@ static PyObject * Rules_profiling_info(
 
   result = PyDict_New();
 
-  rule = rules->rules_list_head;
-
-  while (!RULE_IS_NULL(rule))
+  yr_rules_foreach(rules, rule)
   {
     clock_ticks = rule->clock_ticks;
-    string = rule->strings;
 
-    while (!STRING_IS_NULL(string))
+    yr_rule_strings_foreach(rule, string)
     {
       clock_ticks += string->clock_ticks;
-      string++;
     }
 
     snprintf(key, sizeof(key), "%s:%s", rule->ns->name, rule->identifier);
 
     object = PyLong_FromLongLong(clock_ticks);
     PyDict_SetItemString(result, key, object);
     Py_DECREF(object);
-
-    rule++;
   }
 
   return result;