[Forensics-changes] [yara] 42/160: Don't use "result" variable for temporary values other than function result

[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 d4aa74c7a9bc74fa07becc7ab23dd2a3a2bb325b
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Thu Mar 12 10:16:30 2015 +0100

    Don't use "result" variable for temporary values other than function result
---
 libyara/exec.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/libyara/exec.c b/libyara/exec.c
index a984606..ef7564e 100644
--- a/libyara/exec.c
+++ b/libyara/exec.c
@@ -798,15 +798,14 @@ int yr_execute_code(
           break;
         }
 
-        result = yr_re_exec(
+        r1.i = yr_re_exec(
           (uint8_t*) r2.p,
           (uint8_t*) r1.ss->c_string,
           r1.ss->length,
           RE_FLAGS_SCAN,
           NULL,
-          NULL);
+          NULL) >= 0;
 
-        r1.i = result >= 0;
         push(r1);
         break;
 
@@ -1034,27 +1033,25 @@ int yr_execute_code(
         ensure_defined(r1);
         ensure_defined(r2);
 
-        result = sized_string_cmp(r1.ss, r2.ss);
-
         switch(*ip)
         {
           case OP_STR_EQ:
-            r1.i = (result == 0);
+            r1.i = (sized_string_cmp(r1.ss, r2.ss) == 0);
             break;
           case OP_STR_NEQ:
-            r1.i = (result != 0);
+            r1.i = (sized_string_cmp(r1.ss, r2.ss) != 0);
             break;
           case OP_STR_LT:
-            r1.i = (result < 0);
+            r1.i = (sized_string_cmp(r1.ss, r2.ss) < 0);
             break;
           case OP_STR_LE:
-            r1.i = (result <= 0);
+            r1.i = (sized_string_cmp(r1.ss, r2.ss) <= 0);
             break;
           case OP_STR_GT:
-            r1.i = (result > 0);
+            r1.i = (sized_string_cmp(r1.ss, r2.ss) > 0);
             break;
           case OP_STR_GE:
-            r1.i = (result >= 0);
+            r1.i = (sized_string_cmp(r1.ss, r2.ss) >= 0);
             break;
         }
 

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