Ran the fixup, indent, and comment scripts to standardize the source code.

bacnet-stack/demo/dcc/main.c

@@ -142,9 +142,13 @@ static void Init_Service_Handlers(
     apdu_set_reject_handler(MyRejectHandler);
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 100;     /* milliseconds */
     unsigned max_apdu = 0;

bacnet-stack/demo/epics/main.c

@@ -311,9 +311,13 @@ static uint8_t Read_Properties(
     return invoke_id;
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 100;     /* milliseconds */
     unsigned max_apdu = 0;

bacnet-stack/demo/handler/h_alarm_ack.c

@@ -68,7 +68,8 @@ void handler_alarm_ack(
         goto AA_ABORT;
     }
 
-    len = alarm_ack_decode_service_request(service_request, service_len, &data);
+    len =
+        alarm_ack_decode_service_request(service_request, service_len, &data);
 #if PRINT_ENABLED
     if (len <= 0)
         fprintf(stderr, "Alarm Ack: Unable to decode Request!\n");
@@ -90,10 +91,8 @@ void handler_alarm_ack(
 #if PRINT_ENABLED
     fprintf(stderr,
         "Alarm Ack Operation: Received acknowledge for object id %d from %s for process id %d for object %id\n",
-			data.eventObjectIdentifier.instance, 
+        data.eventObjectIdentifier.instance, data.ackSource.value,
-			data.ackSource.value,
+        data.ackProcessIdentifier, data.eventObjectIdentifier.instance);
-			data.ackProcessIdentifier, 
-			data.eventObjectIdentifier.instance);
 #endif
 
     len =

bacnet-stack/demo/handler/s_ack_alarm.c

@@ -49,7 +49,7 @@
 
 uint8_t Send_Alarm_Acknowledgement(
     uint32_t device_id,
-	BACNET_ALARM_ACK_DATA *data)							
+    BACNET_ALARM_ACK_DATA * data)
 {
     BACNET_ADDRESS dest;
     BACNET_ADDRESS my_address;
@@ -109,4 +109,3 @@ uint8_t Send_Alarm_Acknowledgement(
 
     return invoke_id;
 }
-

bacnet-stack/demo/handler/s_lso.c

@@ -49,7 +49,7 @@
 
 uint8_t Send_Life_Safety_Operation_Data(
     uint32_t device_id,
-	BACNET_LSO_DATA *data)							
+    BACNET_LSO_DATA * data)
 {
     BACNET_ADDRESS dest;
     BACNET_ADDRESS my_address;
@@ -109,4 +109,3 @@ uint8_t Send_Life_Safety_Operation_Data(
 
     return invoke_id;
 }
-

bacnet-stack/demo/iamrouter/main.c

@@ -101,7 +101,10 @@ static void Init_Service_Handlers(
     apdu_set_reject_handler(MyRejectHandler);
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     unsigned arg_count = 0;
 
     if (argc < 2) {
@@ -109,10 +112,7 @@ int main(int argc, char *argv[]) {
             filename_remove_path(argv[0]));
         return 0;
     }
-    if   ((
+    if ((argc > 1) && (strcmp(argv[1], "--help") == 0)) {
-            argc > 1) && (
-            strcmp(argv[1],
-                "--help") == 0)) {
         printf("Send BACnet I-Am-Router-To-Network message for \r\n"
             "one or more networks.\r\n" "\r\nDNET:\r\n"
             "BACnet destination network number 0-65534\r\n"

bacnet-stack/demo/initrouter/main.c

@@ -223,8 +223,11 @@ static void Init_Service_Handlers(
     apdu_set_reject_handler(MyRejectHandler);
 }
 
-static void address_parse(BACNET_ADDRESS * dst,
+static void address_parse(
-    int argc, char *argv[]) {
+    BACNET_ADDRESS * dst,
+    int argc,
+    char *argv[])
+{
     unsigned mac[6];
     unsigned port;
     int count = 0;
@@ -239,8 +242,7 @@ static void address_parse(BACNET_ADDRESS * dst,
             for (index = 0; index < 4; index++) {
                 dst->mac[index] = mac[index];
             }
-            encode_unsigned16(&dst->mac[4],
+            encode_unsigned16(&dst->mac[4], port);
-                port);
         } else {
             count =
                 sscanf(argv[0], "%x:%x:%x:%x:%x:%x", &mac[0], &mac[1], &mac[2],
@@ -262,9 +264,13 @@ static void address_parse(BACNET_ADDRESS * dst,
     }
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 100;     /* milliseconds */
     time_t total_seconds = 0;

bacnet-stack/demo/readfile/main.c

@@ -197,9 +197,13 @@ static void Init_Service_Handlers(
     apdu_set_reject_handler(MyRejectHandler);
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 100;     /* milliseconds */
     unsigned max_apdu = 0;

bacnet-stack/demo/readprop/main.c

@@ -133,9 +133,13 @@ static void Init_Service_Handlers(
     apdu_set_reject_handler(MyRejectHandler);
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 100;     /* milliseconds */
     unsigned max_apdu = 0;

bacnet-stack/demo/readpropm/main.c

@@ -131,7 +131,9 @@ static void Init_Service_Handlers(
     apdu_set_reject_handler(MyRejectHandler);
 }
 
-void cleanup(void) {
+void cleanup(
+    void)
+{
     BACNET_READ_ACCESS_DATA *rpm_object;
     BACNET_READ_ACCESS_DATA *old_rpm_object;
     BACNET_PROPERTY_REFERENCE *rpm_property;
@@ -145,15 +147,20 @@ void cleanup(void) {
             old_rpm_property = rpm_property;
             rpm_property = rpm_property->next;
             free(old_rpm_property);
-        } old_rpm_object = rpm_object;
+        }
+        old_rpm_object = rpm_object;
         rpm_object = rpm_object->next;
         free(old_rpm_object);
     }
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 100;     /* milliseconds */
     unsigned max_apdu = 0;
@@ -165,7 +172,8 @@ int main(int argc, char *argv[]) {
     uint8_t invoke_id = 0;
     bool found = false;
     uint8_t buffer[MAX_PDU] = {
-    0};
+        0
+    };
     BACNET_READ_ACCESS_DATA *rpm_object;
     BACNET_PROPERTY_REFERENCE *rpm_property;
 

bacnet-stack/demo/reinit/main.c

@@ -137,9 +137,13 @@ static void Init_Service_Handlers(
     apdu_set_reject_handler(MyRejectHandler);
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 100;     /* milliseconds */
     unsigned max_apdu = 0;

bacnet-stack/demo/server/main.c

@@ -98,9 +98,13 @@ static void cleanup(
     datalink_cleanup();
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 1000;    /* milliseconds */
     time_t last_seconds = 0;

bacnet-stack/demo/timesync/main.c

@@ -106,9 +106,13 @@ static void Init_Service_Handlers(
     apdu_set_reject_handler(MyRejectHandler);
 }
 
-int main(int argc, char *argv[]) {
+int main(
+    int argc,
+    char *argv[])
+{
     BACNET_ADDRESS src = {
-    0}; /* address where message came from */
+        0
+    };  /* address where message came from */
     uint16_t pdu_len = 0;
     unsigned timeout = 100;     /* milliseconds */
     time_t elapsed_seconds = 0;

bacnet-stack/demo/ucov/main.c

@@ -222,8 +222,8 @@ int main(int argc, char *argv[]) {
             filename_remove_path(argv[0]), filename_remove_path(argv[0]));
         return 0;
     }
-    /* decode the command line parameters */ cov_data.
+    /* decode the command line parameters */
-        subscriberProcessIdentifier = strtol(argv[1], NULL, 0);
+    cov_data.subscriberProcessIdentifier = strtol(argv[1], NULL, 0);
     cov_data.initiatingDeviceIdentifier = strtol(argv[2], NULL, 0);
     cov_data.monitoredObjectIdentifier.type = strtol(argv[3], NULL, 0);
     cov_data.monitoredObjectIdentifier.instance = strtol(argv[4], NULL, 0);

bacnet-stack/include/alarm_ack.h

@@ -87,6 +87,3 @@ extern "C" {
 }
 #endif /* __cplusplus */
 #endif /* ALARM_ACK_H_ */
-
-
-

bacnet-stack/include/client.h

@@ -152,10 +152,10 @@ extern "C" {
 
     uint8_t Send_Life_Safety_Operation_Data(
         uint32_t device_id,
-		BACNET_LSO_DATA *data);
+        BACNET_LSO_DATA * data);
     uint8_t Send_Alarm_Acknowledgement(
         uint32_t device_id,
-		BACNET_ALARM_ACK_DATA *data);
+        BACNET_ALARM_ACK_DATA * data);
 
 
 

bacnet-stack/include/dlenv.h

@@ -29,7 +29,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void dlenv_init(
+    void dlenv_init(
         void);
 
 #ifdef __cplusplus

bacnet-stack/ports/bdk-atxx4-mstp/bootloader/main.c

@@ -241,7 +241,6 @@ int main(
                 _SET_LOCK_BITS(recchar());      /* Read and set lock bits. */
                 sendchar('\r'); /* Send OK back. */
             }
-
 #if defined(_GET_LOCK_BITS)
             /* Read lock bits. */
             else if (val == 'r') {

bacnet-stack/src/alarm_ack.c

@@ -75,22 +75,35 @@ int alarm_ack_encode_service_request(
     int apdu_len = 0;   /* total length of the apdu, return value */
 
     if (apdu) {
-		len = encode_context_unsigned(&apdu[apdu_len], 0, data->ackProcessIdentifier);
+        len =
+            encode_context_unsigned(&apdu[apdu_len], 0,
+            data->ackProcessIdentifier);
         apdu_len += len;
 
-		len = encode_context_object_id(&apdu[apdu_len], 1, data->eventObjectIdentifier.type, data->eventObjectIdentifier.instance);
+        len =
+            encode_context_object_id(&apdu[apdu_len], 1,
+            data->eventObjectIdentifier.type,
+            data->eventObjectIdentifier.instance);
         apdu_len += len;
 
-		len = encode_context_enumerated(&apdu[apdu_len], 2, data->eventTypeAcked);
+        len =
+            encode_context_enumerated(&apdu[apdu_len], 2,
+            data->eventTypeAcked);
         apdu_len += len;
 
-		len = bacapp_encode_context_timestamp(&apdu[apdu_len], 3, &data->eventTimeStamp);
+        len =
+            bacapp_encode_context_timestamp(&apdu[apdu_len], 3,
+            &data->eventTimeStamp);
         apdu_len += len;
 
-		len = encode_context_character_string(&apdu[apdu_len], 4, &data->ackSource);
+        len =
+            encode_context_character_string(&apdu[apdu_len], 4,
+            &data->ackSource);
         apdu_len += len;
 
-		len = bacapp_encode_context_timestamp(&apdu[apdu_len], 5, &data->ackTimeStamp);
+        len =
+            bacapp_encode_context_timestamp(&apdu[apdu_len], 5,
+            &data->ackTimeStamp);
         apdu_len += len;
     }
 
@@ -112,37 +125,44 @@ int alarm_ack_decode_service_request(
     int section_len;
 
     if (-1 == (section_len =
-            decode_context_unsigned(&apdu[len], 0, &data->ackProcessIdentifier))) {
+            decode_context_unsigned(&apdu[len], 0,
+                &data->ackProcessIdentifier))) {
         return -1;
     }
     len += section_len;
 
     if (-1 == (section_len =
-            decode_context_object_id(&apdu[len], 1, &data->eventObjectIdentifier.type, &data->eventObjectIdentifier.instance))) {
+            decode_context_object_id(&apdu[len], 1,
+                &data->eventObjectIdentifier.type,
+                &data->eventObjectIdentifier.instance))) {
         return -1;
     }
     len += section_len;
 
     if (-1 == (section_len =
-            decode_context_enumerated(&apdu[len], 2, (int*)&data->eventTypeAcked))) {
+            decode_context_enumerated(&apdu[len], 2,
+                (int *) &data->eventTypeAcked))) {
         return -1;
     }
     len += section_len;
 
     if (-1 == (section_len =
-            bacapp_decode_context_timestamp(&apdu[len], 3, &data->eventTimeStamp))) {
+            bacapp_decode_context_timestamp(&apdu[len], 3,
+                &data->eventTimeStamp))) {
         return -1;
     }
     len += section_len;
 
     if (-1 == (section_len =
-            decode_context_character_string(&apdu[len], 4, &data->ackSource))) {
+            decode_context_character_string(&apdu[len], 4,
+                &data->ackSource))) {
         return -1;
     }
     len += section_len;
 
     if (-1 == (section_len =
-            bacapp_decode_context_timestamp(&apdu[len], 5, &data->ackTimeStamp))) {
+            bacapp_decode_context_timestamp(&apdu[len], 5,
+                &data->ackTimeStamp))) {
         return -1;
     }
     len += section_len;
@@ -188,23 +208,45 @@ void testAlarmAck(
 
     ct_test(pTest, inLen == outLen);
 
-    ct_test(pTest, testAlarmAckIn.ackProcessIdentifier == testAlarmAckOut.ackProcessIdentifier);
+    ct_test(pTest,
+        testAlarmAckIn.ackProcessIdentifier ==
+        testAlarmAckOut.ackProcessIdentifier);
 
-	ct_test(pTest, testAlarmAckIn.ackTimeStamp.tag == testAlarmAckOut.ackTimeStamp.tag);
+    ct_test(pTest,
-    ct_test(pTest, testAlarmAckIn.ackTimeStamp.value.sequenceNum == testAlarmAckOut.ackTimeStamp.value.sequenceNum);
+        testAlarmAckIn.ackTimeStamp.tag == testAlarmAckOut.ackTimeStamp.tag);
+    ct_test(pTest,
+        testAlarmAckIn.ackTimeStamp.value.sequenceNum ==
+        testAlarmAckOut.ackTimeStamp.value.sequenceNum);
 
-    ct_test(pTest, testAlarmAckIn.ackProcessIdentifier == testAlarmAckOut.ackProcessIdentifier);
+    ct_test(pTest,
+        testAlarmAckIn.ackProcessIdentifier ==
+        testAlarmAckOut.ackProcessIdentifier);
 
-	ct_test(pTest, testAlarmAckIn.eventObjectIdentifier.instance == testAlarmAckOut.eventObjectIdentifier.instance);
+    ct_test(pTest,
-	ct_test(pTest, testAlarmAckIn.eventObjectIdentifier.type == testAlarmAckOut.eventObjectIdentifier.type);
+        testAlarmAckIn.eventObjectIdentifier.instance ==
+        testAlarmAckOut.eventObjectIdentifier.instance);
+    ct_test(pTest,
+        testAlarmAckIn.eventObjectIdentifier.type ==
+        testAlarmAckOut.eventObjectIdentifier.type);
 
-	ct_test(pTest, testAlarmAckIn.eventTimeStamp.tag == testAlarmAckOut.eventTimeStamp.tag);
+    ct_test(pTest,
-    ct_test(pTest, testAlarmAckIn.eventTimeStamp.value.time.hour == testAlarmAckOut.eventTimeStamp.value.time.hour);
+        testAlarmAckIn.eventTimeStamp.tag ==
-    ct_test(pTest, testAlarmAckIn.eventTimeStamp.value.time.min == testAlarmAckOut.eventTimeStamp.value.time.min);
+        testAlarmAckOut.eventTimeStamp.tag);
-    ct_test(pTest, testAlarmAckIn.eventTimeStamp.value.time.sec == testAlarmAckOut.eventTimeStamp.value.time.sec);
+    ct_test(pTest,
-    ct_test(pTest, testAlarmAckIn.eventTimeStamp.value.time.hundredths == testAlarmAckOut.eventTimeStamp.value.time.hundredths);
+        testAlarmAckIn.eventTimeStamp.value.time.hour ==
+        testAlarmAckOut.eventTimeStamp.value.time.hour);
+    ct_test(pTest,
+        testAlarmAckIn.eventTimeStamp.value.time.min ==
+        testAlarmAckOut.eventTimeStamp.value.time.min);
+    ct_test(pTest,
+        testAlarmAckIn.eventTimeStamp.value.time.sec ==
+        testAlarmAckOut.eventTimeStamp.value.time.sec);
+    ct_test(pTest,
+        testAlarmAckIn.eventTimeStamp.value.time.hundredths ==
+        testAlarmAckOut.eventTimeStamp.value.time.hundredths);
 
-	ct_test(pTest, testAlarmAckIn.eventTypeAcked == testAlarmAckOut.eventTypeAcked);
+    ct_test(pTest,
+        testAlarmAckIn.eventTypeAcked == testAlarmAckOut.eventTypeAcked);
 
 }