From 1d9fed6bc62e1a93cd4a8817a6c24978d8f78711 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 19 Nov 2009 16:06:18 +0000
Subject: [PATCH] Removed or #if code that was not embedded friendly when
 building without an OS.

---
 bacnet-stack/src/bacdevobjpropref.c | 3 +--
 bacnet-stack/src/bacprop.c          | 4 ++++
 bacnet-stack/src/bacpropstates.c    | 5 ++---
 bacnet-stack/src/getevent.c         | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bacnet-stack/src/bacdevobjpropref.c b/bacnet-stack/src/bacdevobjpropref.c
index da94d706..cdba757c 100644
--- a/bacnet-stack/src/bacdevobjpropref.c
+++ b/bacnet-stack/src/bacdevobjpropref.c
@@ -32,7 +32,6 @@
  -------------------------------------------
 ####COPYRIGHTEND####*/
 
-#include <assert.h>
 #include "bacdcode.h"
 #include "npdu.h"
 #include "device.h"
@@ -211,7 +210,7 @@ void testDevIdPropRef(
 }
 
 #ifdef TEST_DEV_ID_PROP_REF
-
+#include <assert.h>
 int main(
     void)
 {
diff --git a/bacnet-stack/src/bacprop.c b/bacnet-stack/src/bacprop.c
index 67b259c3..422c1807 100644
--- a/bacnet-stack/src/bacprop.c
+++ b/bacnet-stack/src/bacprop.c
@@ -33,7 +33,9 @@
 ####COPYRIGHTEND####*/
 #include <stdbool.h>
 #include <string.h>
+#if PRINT_ENABLED
 #include <stdio.h>
+#endif
 #include "bacprop.h"
 
 PROP_TAG_DATA bacnet_object_device_property_tag_map[] = {
@@ -107,7 +109,9 @@ signed bacprop_property_tag(
                 bacprop_tag_by_index_default
                 (bacnet_object_device_property_tag_map, prop, -1);
         default:
+#if PRINT_ENABLED
             fprintf(stderr, "Unsupported object type");
+#endif
             break;
     }
 
diff --git a/bacnet-stack/src/bacpropstates.c b/bacnet-stack/src/bacpropstates.c
index 1c268301..7d662b4c 100644
--- a/bacnet-stack/src/bacpropstates.c
+++ b/bacnet-stack/src/bacpropstates.c
@@ -32,7 +32,6 @@
  -------------------------------------------
 ####COPYRIGHTEND####*/
 
-#include <assert.h>
 #include "bacdcode.h"
 #include "npdu.h"
 #include "device.h"
@@ -306,7 +305,7 @@ int bacapp_encode_property_state(
                 break;
 
             default:
-                assert(0);
+                /* FIXME: assert(0); - return a negative len? */
                 break;
         }
     }
@@ -421,7 +420,7 @@ void testPropStates(
 }
 
 #ifdef TEST_PROP_STATES
-
+#include <assert.h>
 int main(
     void)
 {
diff --git a/bacnet-stack/src/getevent.c b/bacnet-stack/src/getevent.c
index 4f598413..101394d4 100644
--- a/bacnet-stack/src/getevent.c
+++ b/bacnet-stack/src/getevent.c
@@ -93,7 +93,7 @@ int getevent_ack_encode_apdu_init(
 {
     int apdu_len = 0;   /* total length of the apdu, return value */
 
-    if (apdu) {
+    if (apdu && (max_apdu >= 4)) {
         apdu[0] = PDU_TYPE_COMPLEX_ACK; /* complex ACK service */
         apdu[1] = invoke_id;    /* original invoke id from request */
         apdu[2] = SERVICE_CONFIRMED_GET_EVENT_INFORMATION;