diff --git a/bacnet-stack/demo/dcc/main.c b/bacnet-stack/demo/dcc/main.c
index 11395854..d57ec35b 100644
--- a/bacnet-stack/demo/dcc/main.c
+++ b/bacnet-stack/demo/dcc/main.c
@@ -54,7 +54,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/epics/main.c b/bacnet-stack/demo/epics/main.c
index 52040732..f35296bf 100644
--- a/bacnet-stack/demo/epics/main.c
+++ b/bacnet-stack/demo/epics/main.c
@@ -65,7 +65,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/gateway/main.c b/bacnet-stack/demo/gateway/main.c
index 4af3679e..56abfaf1 100644
--- a/bacnet-stack/demo/gateway/main.c
+++ b/bacnet-stack/demo/gateway/main.c
@@ -100,7 +100,8 @@ static object_functions_t Object_Table[] = {
 #if defined(BACFILE)
     {FILE_OBJ_FUNCTIONS},
 #endif
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /** Buffer used for receiving */
diff --git a/bacnet-stack/demo/ptransfer/main.c b/bacnet-stack/demo/ptransfer/main.c
index 6c5597e5..aecb4c97 100644
--- a/bacnet-stack/demo/ptransfer/main.c
+++ b/bacnet-stack/demo/ptransfer/main.c
@@ -69,7 +69,8 @@ uint8_t Send_Private_Transfer_Request(
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/readfile/main.c b/bacnet-stack/demo/readfile/main.c
index 05463819..7e91bdc3 100644
--- a/bacnet-stack/demo/readfile/main.c
+++ b/bacnet-stack/demo/readfile/main.c
@@ -53,7 +53,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/readprop/main.c b/bacnet-stack/demo/readprop/main.c
index b5ba03ea..90accbd3 100644
--- a/bacnet-stack/demo/readprop/main.c
+++ b/bacnet-stack/demo/readprop/main.c
@@ -56,7 +56,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/readpropm/main.c b/bacnet-stack/demo/readpropm/main.c
index a038a250..23be2a7a 100644
--- a/bacnet-stack/demo/readpropm/main.c
+++ b/bacnet-stack/demo/readpropm/main.c
@@ -57,7 +57,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/readrange/main.c b/bacnet-stack/demo/readrange/main.c
index 7088f004..b7eb0681 100644
--- a/bacnet-stack/demo/readrange/main.c
+++ b/bacnet-stack/demo/readrange/main.c
@@ -83,7 +83,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/reinit/main.c b/bacnet-stack/demo/reinit/main.c
index a1cf6cd2..f97f0128 100644
--- a/bacnet-stack/demo/reinit/main.c
+++ b/bacnet-stack/demo/reinit/main.c
@@ -54,7 +54,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/server/main.c b/bacnet-stack/demo/server/main.c
index be706089..1a112904 100644
--- a/bacnet-stack/demo/server/main.c
+++ b/bacnet-stack/demo/server/main.c
@@ -82,7 +82,8 @@ static object_functions_t Object_Table[] = {
 #if defined(BACFILE)
     {FILE_OBJ_FUNCTIONS},
 #endif
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /** @file server/main.c  Example server application using the BACnet Stack. */
diff --git a/bacnet-stack/demo/timesync/main.c b/bacnet-stack/demo/timesync/main.c
index 14787bd5..df5ec9ee 100644
--- a/bacnet-stack/demo/timesync/main.c
+++ b/bacnet-stack/demo/timesync/main.c
@@ -49,7 +49,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/ucov/main.c b/bacnet-stack/demo/ucov/main.c
index cd79299c..947c5658 100644
--- a/bacnet-stack/demo/ucov/main.c
+++ b/bacnet-stack/demo/ucov/main.c
@@ -53,7 +53,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 static void Init_Service_Handlers(
diff --git a/bacnet-stack/demo/whohas/main.c b/bacnet-stack/demo/whohas/main.c
index 5e079b44..2c4f686b 100644
--- a/bacnet-stack/demo/whohas/main.c
+++ b/bacnet-stack/demo/whohas/main.c
@@ -53,7 +53,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/whois/main.c b/bacnet-stack/demo/whois/main.c
index 6cea6375..a744b043 100644
--- a/bacnet-stack/demo/whois/main.c
+++ b/bacnet-stack/demo/whois/main.c
@@ -53,7 +53,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/writefile/main.c b/bacnet-stack/demo/writefile/main.c
index efb08479..08e7b95f 100644
--- a/bacnet-stack/demo/writefile/main.c
+++ b/bacnet-stack/demo/writefile/main.c
@@ -53,7 +53,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */
diff --git a/bacnet-stack/demo/writeprop/main.c b/bacnet-stack/demo/writeprop/main.c
index f3fe73db..c6a5915c 100644
--- a/bacnet-stack/demo/writeprop/main.c
+++ b/bacnet-stack/demo/writeprop/main.c
@@ -59,7 +59,8 @@
 /* All included BACnet objects */
 static object_functions_t Object_Table[] = {
     {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
+     NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
 /* buffer used for receive */