[Forensics-changes] [yara] 244/407: Minor style changes

[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 279ae0b469ebf273a232a2640ef9c74906d7cfc5
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Mon Dec 1 21:09:17 2014 +0100

    Minor style changes
---
 libyara/re.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/libyara/re.c b/libyara/re.c
index 05fd958..12d5b13 100644
--- a/libyara/re.c
+++ b/libyara/re.c
@@ -1431,7 +1431,7 @@ int _yr_re_fiber_sync(
     {
       case RE_OPCODE_SPLIT_A:
         new_fiber = _yr_re_fiber_split(fiber, fiber_list, fiber_pool);
-        if (! new_fiber)
+        if (new_fiber == NULL)
           return ERROR_INSUFICIENT_MEMORY;
 
         new_fiber->ip += *(int16_t*)(fiber->ip + 1);
@@ -1440,7 +1440,7 @@ int _yr_re_fiber_sync(
 
       case RE_OPCODE_SPLIT_B:
         new_fiber = _yr_re_fiber_split(fiber, fiber_list, fiber_pool);
-        if (! new_fiber)
+        if (new_fiber == NULL)
           return ERROR_INSUFICIENT_MEMORY;
 
         new_fiber->ip += 3;
@@ -1522,7 +1522,7 @@ int yr_re_exec(
   RE_FIBER* fiber;
   RE_FIBER* next_fiber;
 
-  int rc;
+  int error;
   int count;
   int max_count;
   int match;
@@ -1564,8 +1564,9 @@ int yr_re_exec(
   fibers.head = fiber;
   fibers.tail = fiber;
 
-  rc = _yr_re_fiber_sync(&fibers, &storage->fiber_pool, fiber);
-  if (rc != ERROR_SUCCESS)
+  error = _yr_re_fiber_sync(&fibers, &storage->fiber_pool, fiber);
+
+  if (error != ERROR_SUCCESS)
     return -2;
 
   while (fibers.head != NULL)
@@ -1756,15 +1757,15 @@ int yr_re_exec(
 
         case ACTION_CONTINUE:
           fiber->ip += 1;
-          rc = _yr_re_fiber_sync(&fibers, &storage->fiber_pool, fiber);
-          if (rc != ERROR_SUCCESS)
+          error = _yr_re_fiber_sync(&fibers, &storage->fiber_pool, fiber);
+          if (error != ERROR_SUCCESS)
             return -2;
           break;
 
         default:
           next_fiber = fiber->next;
-          rc = _yr_re_fiber_sync(&fibers, &storage->fiber_pool, fiber);
-          if (rc != ERROR_SUCCESS)
+          error = _yr_re_fiber_sync(&fibers, &storage->fiber_pool, fiber);
+          if (error != ERROR_SUCCESS)
             return -2;
           fiber = next_fiber;
       }
@@ -1786,8 +1787,10 @@ int yr_re_exec(
       fiber->ip = re_code;
 
       _yr_re_fiber_append(&fibers, fiber);
-      rc = _yr_re_fiber_sync(&fibers, &storage->fiber_pool, fiber);
-      if (rc != ERROR_SUCCESS)
+
+      error = _yr_re_fiber_sync(&fibers, &storage->fiber_pool, fiber);
+
+      if (error != ERROR_SUCCESS)
         return -2;
     }
   }

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