commit 12b495d6a54d8dee1f16881d0c2d84949b78330b
author Laurence Lundblade <lgl@island-resort.com> Mon Dec 17 11:15:54 2018 -0800
committer Laurence Lundblade <lgl@island-resort.com> Mon Dec 17 11:15:54 2018 -0800
tree bde23d6233d451843ec33d6f10388f564866f719
parent f2801956a9ca91d5bfd07f7adb0e97118460f232

fixes for a couple of decode tests; add -Wparentheses to the makefile to catch these errors

test/qcbor_decode_tests.c

diff --git a/test/qcbor_decode_tests.c b/test/qcbor_decode_tests.c
index 558074f..999a9b7 100644
--- a/test/qcbor_decode_tests.c
+++ b/test/qcbor_decode_tests.c
@@ -524,7 +524,7 @@
       goto Done;
    
    // First integer
-   if(QCBORDecode_GetNext(&DCtx, &Item) != 0 | Item.uDataType != QCBOR_TYPE_INT64)
+   if(QCBORDecode_GetNext(&DCtx, &Item) != 0 || Item.uDataType != QCBOR_TYPE_INT64)
       goto Done;
    *pInt1 = Item.val.int64;
    
@@ -2267,14 +2267,14 @@
     }
     
     QCBORDecode_GetNext(&DC, &Item);
-    if(Item.uDataType != QCBOR_TYPE_INT64 |
+    if(Item.uDataType != QCBOR_TYPE_INT64 ||
        Item.uNestingLevel != 2 ||
        Item.uNextNestLevel != 2) {
         return -4;
     }
     
     QCBORDecode_GetNext(&DC, &Item);
-    if(Item.uDataType != QCBOR_TYPE_INT64 |
+    if(Item.uDataType != QCBOR_TYPE_INT64 ||
        Item.uNestingLevel != 2 ||
        Item.uNextNestLevel != 0) {
         return -5;