From 9051a80e30f023fcb683d97dc97a6f4d7da9a5f1 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Sat, 18 Apr 2009 15:29:47 +0000
Subject: [PATCH] Corrected warnings found in splint review.  Cleaned up
 previous use of datalink in core files.

---
 bacnet-stack/src/bacdevobjpropref.c |  4 +--
 bacnet-stack/src/cov.c              | 42 -----------------------
 bacnet-stack/src/iam.c              | 53 -----------------------------
 bacnet-stack/test/cov.mak           |  2 +-
 bacnet-stack/test/iam.mak           |  5 +--
 5 files changed, 4 insertions(+), 102 deletions(-)

diff --git a/bacnet-stack/src/bacdevobjpropref.c b/bacnet-stack/src/bacdevobjpropref.c
index 0b6664a7..46055ba2 100644
--- a/bacnet-stack/src/bacdevobjpropref.c
+++ b/bacnet-stack/src/bacdevobjpropref.c
@@ -68,7 +68,7 @@ int bacapp_encode_device_obj_property_ref(
 
     len =
         encode_context_object_id(&apdu[apdu_len], 0,
-        value->objectIdentifier.type, value->objectIdentifier.instance);
+        (int)value->objectIdentifier.type, value->objectIdentifier.instance);
     apdu_len += len;
 
     len =
@@ -82,7 +82,7 @@ int bacapp_encode_device_obj_property_ref(
     }
     len =
         encode_context_object_id(&apdu[apdu_len], 3,
-        value->deviceIndentifier.type, value->deviceIndentifier.instance);
+        (int)value->deviceIndentifier.type, value->deviceIndentifier.instance);
     apdu_len += len;
 
     return apdu_len;
diff --git a/bacnet-stack/src/cov.c b/bacnet-stack/src/cov.c
index 4f6dbaac..115bb93a 100644
--- a/bacnet-stack/src/cov.c
+++ b/bacnet-stack/src/cov.c
@@ -37,8 +37,6 @@
 #include "bacdef.h"
 #include "bacapp.h"
 #include "cov.h"
-#include "datalink.h"
-#include "npdu.h"
 
 /* encode service */
 
@@ -728,46 +726,6 @@ int cov_subscribe_property_decode_apdu(
     return len;
 }
 
-/* dummy function stubs */
-int npdu_encode_pdu(
-    uint8_t * npdu,
-    BACNET_ADDRESS * dest,
-    BACNET_ADDRESS * src,
-    BACNET_NPDU_DATA * npdu_data)
-{
-    return 0;
-}
-
-void npdu_encode_npdu_data(
-    BACNET_NPDU_DATA * npdu,
-    bool data_expecting_reply,
-    BACNET_MESSAGE_PRIORITY priority)
-{
-
-}
-
-/* dummy function stubs */
-int datalink_send_pdu(
-    BACNET_ADDRESS * dest,
-    BACNET_NPDU_DATA * npdu_data,
-    uint8_t * pdu,
-    unsigned pdu_len)
-{
-    (void) dest;
-    (void) npdu_data;
-    (void) pdu;
-    (void) pdu_len;
-
-    return 0;
-}
-
-/* dummy function stubs */
-void datalink_get_broadcast_address(
-    BACNET_ADDRESS * dest)
-{
-    (void) dest;
-}
-
 /* dummy function stubs */
 void testCOVNotifyData(
     Test * pTest,
diff --git a/bacnet-stack/src/iam.c b/bacnet-stack/src/iam.c
index e758a30e..6bddd063 100755
--- a/bacnet-stack/src/iam.c
+++ b/bacnet-stack/src/iam.c
@@ -36,7 +36,6 @@
 #include "bacdef.h"
 #include "npdu.h"
 #include "dcc.h"
-#include "datalink.h"
 #include "device.h"
 #include "bacdcode.h"
 #include "address.h"
@@ -196,58 +195,6 @@ void testIAm(
 }
 
 #ifdef TEST_IAM
-/* dummy function stubs */
-int datalink_send_pdu(
-    BACNET_ADDRESS * dest,
-    BACNET_NPDU_DATA * npdu_data,
-    uint8_t * pdu,
-    unsigned pdu_len)
-{
-    (void) dest;
-    (void) npdu_data;
-    (void) pdu;
-    (void) pdu_len;
-
-    return 0;
-}
-
-void datalink_get_broadcast_address(
-    BACNET_ADDRESS * dest)
-{       /* destination address */
-    (void) dest;
-}
-
-uint16_t Device_Vendor_Identifier(
-    void)
-{
-    return 0;
-}
-
-uint32_t Device_Object_Instance_Number(
-    void)
-{
-    return 0;
-}
-
-void address_add_binding(
-    uint32_t device_id,
-    unsigned max_apdu,
-    BACNET_ADDRESS * src)
-{
-    (void) device_id;
-    (void) max_apdu;
-    (void) src;
-}
-
-/* dummy for apdu dependency */
-void tsm_free_invoke_id(
-    uint8_t invokeID)
-{
-    /* dummy stub for testing */
-    (void) invokeID;
-}
-
-
 int main(
     void)
 {
diff --git a/bacnet-stack/test/cov.mak b/bacnet-stack/test/cov.mak
index 0a9a3e78..684db809 100644
--- a/bacnet-stack/test/cov.mak
+++ b/bacnet-stack/test/cov.mak
@@ -2,7 +2,7 @@
 CC      = gcc
 SRC_DIR = ../src
 INCLUDES = -I../include -I. -I../demo/object 
-DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_COV -DBACDL_TEST=1 -DBACAPP_ALL
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_COV -DBACAPP_ALL
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
diff --git a/bacnet-stack/test/iam.mak b/bacnet-stack/test/iam.mak
index 93689d4c..b79053ba 100755
--- a/bacnet-stack/test/iam.mak
+++ b/bacnet-stack/test/iam.mak
@@ -2,7 +2,7 @@
 CC = gcc
 SRC_DIR = ../src
 INCLUDES = -I../include -I.
-DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_IAM -DBACDL_TEST
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_IAM
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
@@ -10,9 +10,6 @@ SRCS = $(SRC_DIR)/bacdcode.c \
 	$(SRC_DIR)/bacint.c \
 	$(SRC_DIR)/bacstr.c \
 	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/npdu.c \
-	$(SRC_DIR)/apdu.c \
-	$(SRC_DIR)/dcc.c \
 	$(SRC_DIR)/iam.c \
 	ctest.c