From e0f0366f920a4681be3ceb60bb86ecc82d14ce54 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 9 Dec 2014 21:17:46 +0000
Subject: -handle negative results correctly

---
 src/scalarproduct/gnunet-scalarproduct.c         | 3 +--
 src/scalarproduct/scalarproduct_api.c            | 4 ++--
 src/scalarproduct/test_scalarproduct_negative.sh | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/scalarproduct/gnunet-scalarproduct.c
index 6f8d03bf3..b3b954211 100644
--- a/src/scalarproduct/gnunet-scalarproduct.c
+++ b/src/scalarproduct/gnunet-scalarproduct.c
@@ -138,8 +138,7 @@ requester_callback (void *cls,
     {
       ret = 0;
       fprintf (stdout,
-               "%s%s\n",
-               (0 > gcry_mpi_cmp_ui (result, 0)) ? "-" : "",
+               "%s\n",
                buf);
       fflush (stdout);
     }
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index cae045d62..cd63030bd 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -389,9 +389,9 @@ process_result_message (struct GNUNET_SCALARPRODUCT_ComputationHandle *h,
       }
       else
       {
-        if (0 < ntohl (msg->range))
+        if (0 < (int32_t) ntohl (msg->range))
           gcry_mpi_add (result, result, num);
-        else if (0 > ntohl (msg->range))
+        else
           gcry_mpi_sub (result, result, num);
         gcry_mpi_release (num);
       }
diff --git a/src/scalarproduct/test_scalarproduct_negative.sh b/src/scalarproduct/test_scalarproduct_negative.sh
index a7514cf5e..eb9ead4bf 100755
--- a/src/scalarproduct/test_scalarproduct_negative.sh
+++ b/src/scalarproduct/test_scalarproduct_negative.sh
@@ -39,6 +39,6 @@ then
     	echo "OK"
         exit 0
 else
-    	echo "Result $RESULT NOTOK"
+    	echo "Result $RESULT, expected $EXPECTED NOTOK"
         exit 1
 fi
-- 
cgit v1.2.3