From 457ceb4a2537c73f6560d0c851ba72ee95022d36 Mon Sep 17 00:00:00 2001
From: Steve Karg <skarg@users.sourceforge.net>
Date: Sat, 10 Sep 2022 20:41:38 -0500
Subject: [PATCH] fix cppcheck errors

---
 src/bacnet/bacapp.c                         | 12 +++++++-----
 src/bacnet/basic/object/gateway/gw_device.c |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/bacnet/bacapp.c b/src/bacnet/bacapp.c
index 4adae6ba..d1611560 100644
--- a/src/bacnet/bacapp.c
+++ b/src/bacnet/bacapp.c
@@ -1569,11 +1569,10 @@ static int bacapp_snprintf_date(char *str, size_t str_len, BACNET_DATE *bdate)
     int slen = 0;
 
     /* false positive cppcheck - snprintf allows null pointers */
-    /* cppcheck-suppress nullPointer */
-    /* cppcheck-suppress ctunullpointer */
-    slen =
-        snprintf(str, str_len, "%s, %s", bactext_day_of_week_name(bdate->wday),
-            bactext_month_name(bdate->month));
+    /* cppcheck-suppress [nullPointer, ctunullpointer] */
+    slen = snprintf(str, str_len, "%s, %s",
+        bactext_day_of_week_name(bdate->wday),
+        bactext_month_name(bdate->month));
     if (str) {
         str += slen;
         if (str_len >= slen) {
@@ -2310,6 +2309,9 @@ bool bacapp_print_value(
 #else
         char *str;
         str = calloc(sizeof(char), str_len + 1);
+        if (!str) {
+            return false;
+        }
 #endif
         bacapp_snprintf_value(str, str_len + 1, object_value);
         if (stream) {
diff --git a/src/bacnet/basic/object/gateway/gw_device.c b/src/bacnet/basic/object/gateway/gw_device.c
index dfc2a582..7d2f280b 100644
--- a/src/bacnet/basic/object/gateway/gw_device.c
+++ b/src/bacnet/basic/object/gateway/gw_device.c
@@ -216,10 +216,11 @@ void routed_get_my_address(BACNET_ADDRESS *my_address)
 bool Routed_Device_Address_Lookup(int idx, uint8_t dlen, uint8_t *dadr)
 {
     bool result = false;
-    DEVICE_OBJECT_DATA *pDev = &Devices[idx];
+    DEVICE_OBJECT_DATA *pDev;
     int i;
 
     if ((idx >= 0) && (idx < MAX_NUM_DEVICES)) {
+        pDev = &Devices[idx];
         if (dlen == 0) {
             /* Automatic match */
             iCurrent_Device_Idx = idx;
@@ -236,6 +237,7 @@ bool Routed_Device_Address_Lookup(int idx, uint8_t dlen, uint8_t *dadr)
             }
         }
     }
+
     return result;
 }