[Forensics-changes] [yara] 65/407: Rename cur_rule to iter_current_rule

[Hilko Bengen]

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

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

commit c20bac259fe79bae5a5a1ce3796c6c50e5f51135
Author: Victor Manuel Alvarez <vmalvarez at virustotal.com>
Date:   Wed Sep 24 23:45:09 2014 +0200

    Rename cur_rule to iter_current_rule
---
 yara-python/yara-python.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/yara-python/yara-python.c b/yara-python/yara-python.c
index 07fc34c..ecb8b85 100644
--- a/yara-python/yara-python.c
+++ b/yara-python/yara-python.c
@@ -285,7 +285,7 @@ typedef struct
   PyObject_HEAD
   PyObject* externals;
   YR_RULES* rules;
-  YR_RULE* cur_rule;
+  YR_RULE* iter_current_rule;
 } Rules;
 
 static void Rules_dealloc(
@@ -901,9 +901,11 @@ static PyObject * Rules_next(PyObject *self)
   const char *tag;
 
   rules = (Rules *) self;
-  // Generate new Rule object based upon cur_rule
-  // Increment cur_rule.
-  if (RULE_IS_NULL(rules->cur_rule))
+
+  // Generate new Rule object based upon iter_current_rule and increment
+  // iter_current_rule.
+
+  if (RULE_IS_NULL(rules->iter_current_rule))
   {
     PyErr_SetNone(PyExc_StopIteration);
     return NULL;
@@ -914,14 +916,14 @@ static PyObject * Rules_next(PyObject *self)
   meta_list = PyDict_New();
   if (rule != NULL && tag_list != NULL && meta_list != NULL)
   {
-    yr_rule_tags_foreach(rules->cur_rule, tag)
+    yr_rule_tags_foreach(rules->iter_current_rule, tag)
     {
       object = PY_STRING(tag);
       PyList_Append(tag_list, object);
       Py_DECREF(object);
     }
 
-    yr_rule_metas_foreach(rules->cur_rule, meta)
+    yr_rule_metas_foreach(rules->iter_current_rule, meta)
     {
       if (meta->type == META_TYPE_INTEGER)
         object = Py_BuildValue("I", meta->integer);
@@ -934,10 +936,10 @@ static PyObject * Rules_next(PyObject *self)
       Py_DECREF(object);
     }
 
-    rule->identifier = PY_STRING(rules->cur_rule->identifier);
+    rule->identifier = PY_STRING(rules->iter_current_rule->identifier);
     rule->tags = tag_list;
     rule->meta = meta_list;
-    rules->cur_rule++;
+    rules->iter_current_rule++;
     return (PyObject *) rule;
   }
   else
@@ -1491,7 +1493,7 @@ static PyObject * yara_compile(
         if (error == ERROR_SUCCESS)
         {
           rules->rules = yara_rules;
-          rules->cur_rule = rules->rules->rules_list_head;
+          rules->iter_current_rule = rules->rules->rules_list_head;
 
           if (externals != NULL)
             rules->externals = PyDict_Copy(externals);
@@ -1548,7 +1550,7 @@ static PyObject * yara_load(
       return handle_error(error, filepath);
 
     external = rules->rules->externals_list_head;
-    rules->cur_rule = rules->rules->rules_list_head;
+    rules->iter_current_rule = rules->rules->rules_list_head;
 
     if (!EXTERNAL_VARIABLE_IS_NULL(external))
       rules->externals = PyDict_New();

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