FORMATTING - minor cleanup of the unit test.

This patch adds formatting changes to
better follow the style guidelines in
the collection unit test.
No logical changes to the code.
I was planning to do it for a while
per Simo's comment when he accepted
the core of the collection code but
indicated that the unit test should be
cleaned later.
Later has come.

1 files changed, 283 insertions, 254 deletions

diff --git a/common/collection/collection_ut.c b/common/collection/collection_ut.c
index 21f768be..15cebdbf 100644
--- a/common/collection/collection_ut.c
+++ b/common/collection/collection_ut.c
@@ -37,68 +37,69 @@ int ref_collection_test()
 
     int error = EOK;
 
-    TRACE_FLOW_STRING("ref_collection_test","Entry.");
+    TRACE_FLOW_STRING("ref_collection_test", "Entry.");
 
     printf("\n\nREF TEST!!!.\n\n\n");
     printf("Creating PEER collection.\n");
 
-    if((error=create_collection(&peer,"peer",0)) ||
-       (error=add_str_property(peer,NULL,"hostname","peerhost.mytest.com",0)) ||
-       (error=add_str_property(peer,NULL,"IPv4","10.10.10.10",12)) || /* Expect trailing zero to be truncated */
-       (error=add_str_property(peer,NULL,"IPv6","bla:bla:bla:bla:bla:bla",0))) {
-        printf("Failed to add property. Error %d\n",error);
+    if ((error = create_collection(&peer, "peer", 0)) ||
+        (error = add_str_property(peer, NULL, "hostname", "peerhost.mytest.com", 0)) ||
+        /* Expect trailing zero to be truncated */
+        (error = add_str_property(peer, NULL, "IPv4", "10.10.10.10", 12)) ||
+        (error = add_str_property(peer, NULL, "IPv6", "bla:bla:bla:bla:bla:bla", 0))) {
+        printf("Failed to add property. Error %d\n", error);
         destroy_collection(peer);
         return error;
     }
 
     printf("Creating SOCKET collection.\n");
 
-    if((error=create_collection(&socket,"socket",0)) ||
-       (error=add_int_property(socket,NULL,"id",1)) ||
-       (error=add_long_property(socket,NULL,"packets",100000000L)) ||
-       (error=add_binary_property(socket,NULL,"stack",binary_dump,sizeof(binary_dump)))) {
+    if ((error = create_collection(&socket, "socket", 0)) ||
+        (error = add_int_property(socket, NULL, "id", 1)) ||
+        (error = add_long_property(socket, NULL, "packets", 100000000L)) ||
+        (error = add_binary_property(socket, NULL, "stack", binary_dump, sizeof(binary_dump)))) {
         destroy_collection(peer);
         destroy_collection(socket);
-        printf("Failed to add property. Error %d\n",error);
+        printf("Failed to add property. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket,COL_TRAVERSE_DEFAULT);
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket, COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
 
     printf("Adding PEER collection to SOCKET collection as a reference named PEER\n");
 
     /* Embed peer host into the socket2 as reference */
-    error = add_collection_to_collection(socket,NULL,"peer",peer,COL_ADD_MODE_REFERENCE);
-    if(error) {
+    error = add_collection_to_collection(socket, NULL, "peer", peer, COL_ADD_MODE_REFERENCE);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(socket);
-        printf("Failed to add collection to collection. Error %d\n",error);
+        printf("Failed to add collection to collection. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket,COL_TRAVERSE_DEFAULT);
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket, COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
 
     printf("About to destroy PEER\n");
     destroy_collection(peer);
-    debug_collection(socket,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket, COL_TRAVERSE_DEFAULT);
 
     printf("About to extract PEER\n");
-    error = get_collection_reference(socket,&peer,"peer");
-    if(error) {
+    error = get_collection_reference(socket, &peer, "peer");
+    if (error) {
         destroy_collection(socket);
-        printf("Failed to extract collection. Error %d\n",error);
+        printf("Failed to extract collection. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket,COL_TRAVERSE_DEFAULT);
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket, COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
     destroy_collection(peer);
 
-    debug_collection(socket,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket, COL_TRAVERSE_DEFAULT);
     destroy_collection(socket);
-    TRACE_FLOW_NUMBER("ref_collection_test. Returning",error);
+    TRACE_FLOW_NUMBER("ref_collection_test. Returning", error);
 
     printf("\n\nEND OF REF TEST!!!.\n\n\n");
 
@@ -112,54 +113,54 @@ int single_collection_test()
     struct collection_item *handle = NULL;
     int error = EOK;
 
-    TRACE_FLOW_STRING("single_collection_test","Entry.");
+    TRACE_FLOW_STRING("single_collection_test", "Entry.");
 
-    if((error=create_collection(&handle,"string_test",0)) ||
-       (error=add_str_property(handle,NULL,"property_1","some data",0)) ||
-       (error=add_str_property(handle,NULL,"property_2","some other data",2)) ||
-       (error=add_str_property(handle,NULL,"property_3","more data",7))) {
-        printf("Failed to add property. Error %d",error);
+    if ((error = create_collection(&handle, "string_test", 0)) ||
+        (error = add_str_property(handle, NULL, "property_1", "some data", 0)) ||
+        (error = add_str_property(handle, NULL, "property_2", "some other data", 2)) ||
+        (error = add_str_property(handle, NULL, "property_3", "more data", 7))) {
+        printf("Failed to add property. Error %d", error);
         destroy_collection(handle);
         return error;
     }
 
-    error = add_str_property(handle,NULL,"property 1","some data",0);
-    if(error) printf("Expected error adding bad property to collection %d\n",error);
+    error = add_str_property(handle, NULL, "property 1", "some data", 0);
+    if (error) printf("Expected error adding bad property to collection %d\n", error);
     else {
         printf("Expected error but got success\n");
         return -1;
     }
 
-    error=add_double_property(handle,NULL,"double",0.253545);
-    if(error) {
-        printf("Failed to add property. Error %d",error);
+    error = add_double_property(handle, NULL, "double", 0.253545);
+    if (error) {
+        printf("Failed to add property. Error %d", error);
         destroy_collection(handle);
         return error;
     }
 
-    error=update_double_property(handle,"double",COL_TRAVERSE_DEFAULT,1.999999);
-    if(error) {
-        printf("Failed to add property. Error %d",error);
+    error = update_double_property(handle, "double", COL_TRAVERSE_DEFAULT, 1.999999);
+    if (error) {
+        printf("Failed to add property. Error %d", error);
         destroy_collection(handle);
         return error;
     }
     printf("Created collection\n");
 
     /* Traverse collection */
-    error = debug_collection(handle,COL_TRAVERSE_DEFAULT);
-    if(error) {
-        printf("Error debugging collection %d\n",error);
+    error = debug_collection(handle, COL_TRAVERSE_DEFAULT);
+    if (error) {
+        printf("Error debugging collection %d\n", error);
         return error;
     }
     error = print_collection(handle);
-    if(error) {
-        printf("Error printing collection %d\n",error);
+    if (error) {
+        printf("Error printing collection %d\n", error);
         return error;
     }
 
     destroy_collection(handle);
 
-    TRACE_FLOW_NUMBER("single_collection_test. Error: ",error);
+    TRACE_FLOW_NUMBER("single_collection_test. Error: ", error);
     return error;
 }
 
@@ -171,52 +172,53 @@ int add_collection_test()
 
     int error = EOK;
 
-    TRACE_FLOW_STRING("add_collection_test","Entry.");
+    TRACE_FLOW_STRING("add_collection_test", "Entry.");
 
     printf("\n\nADD TEST!!!.\n\n\n");
     printf("Creating PEER collection.\n");
 
-    if((error=create_collection(&peer,"peer",0)) ||
-       (error=add_str_property(peer,NULL,"hostname","peerhost.mytest.com",0)) ||
-       (error=add_str_property(peer,NULL,"IPv4","10.10.10.10",12)) || /* Expect trailing zero to be truncated */
-       (error=add_str_property(peer,NULL,"IPv6","bla:bla:bla:bla:bla:bla",0))) {
-        printf("Failed to add property. Error %d",error);
+    if ((error = create_collection(&peer, "peer", 0)) ||
+        (error = add_str_property(peer, NULL, "hostname", "peerhost.mytest.com", 0)) ||
+        /* Expect trailing zero to be truncated */
+        (error = add_str_property(peer, NULL, "IPv4", "10.10.10.10", 12)) ||
+        (error = add_str_property(peer, NULL, "IPv6", "bla:bla:bla:bla:bla:bla", 0))) {
+        printf("Failed to add property. Error %d", error);
         destroy_collection(peer);
         return error;
     }
 
     printf("Creating SOCKET collection.\n");
 
-    if((error=create_collection(&socket,"socket",0)) ||
-       (error=add_int_property(socket,NULL,"id",1)) ||
-       (error=add_long_property(socket,NULL,"packets",100000000L)) ||
-       (error=add_binary_property(socket,NULL,"stack",binary_dump,sizeof(binary_dump)))) {
+    if ((error = create_collection(&socket, "socket", 0)) ||
+        (error = add_int_property(socket, NULL, "id", 1)) ||
+        (error = add_long_property(socket, NULL, "packets", 100000000L)) ||
+        (error = add_binary_property(socket, NULL, "stack", binary_dump, sizeof(binary_dump)))) {
         destroy_collection(peer);
         destroy_collection(socket);
-        printf("Failed to add property. Error %d\n",error);
+        printf("Failed to add property. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket,COL_TRAVERSE_DEFAULT);
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket, COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
 
     printf("Adding PEER collection to SOCKET collection as a reference named PEER\n");
 
     /* Embed peer host into the socket2 as reference */
-    error = add_collection_to_collection(socket,NULL,"peer",peer,COL_ADD_MODE_REFERENCE);
-    if(error) {
+    error = add_collection_to_collection(socket, NULL, "peer", peer, COL_ADD_MODE_REFERENCE);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(socket);
-        printf("Failed to create collection. Error %d\n",error);
+        printf("Failed to create collection. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket,COL_TRAVERSE_DEFAULT);
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket, COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
     destroy_collection(peer);
-    debug_collection(socket,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket, COL_TRAVERSE_DEFAULT);
     destroy_collection(socket);
-    TRACE_FLOW_NUMBER("add_collection_test. Returning",error);
+    TRACE_FLOW_NUMBER("add_collection_test. Returning", error);
     return error;
 }
 
@@ -233,191 +235,192 @@ int mixed_collection_test()
 
     int error = EOK;
 
-    TRACE_FLOW_STRING("mixed_collection_test","Entry.");
+    TRACE_FLOW_STRING("mixed_collection_test", "Entry.");
 
     printf("\n\nMIXED TEST!!!.\n\n\n");
     printf("Creating PEER collection.\n");
 
-    if((error=create_collection(&peer,"peer",0)) ||
-       (error=add_str_property(peer,NULL,"hostname","peerhost.mytest.com",0)) ||
-       (error=add_str_property(peer,NULL,"IPv4","10.10.10.10",12)) || /* Expect trailing zero to be truncated */
-       (error=add_str_property(peer,NULL,"IPv6","bla:bla:bla:bla:bla:bla",0))) {
-        printf("Failed to add property. Error %d",error);
+    if ((error = create_collection(&peer, "peer", 0)) ||
+        (error = add_str_property(peer, NULL, "hostname", "peerhost.mytest.com", 0)) ||
+        /* Expect trailing zero to be truncated */
+        (error = add_str_property(peer, NULL, "IPv4", "10.10.10.10", 12)) ||
+        (error = add_str_property(peer, NULL, "IPv6", "bla:bla:bla:bla:bla:bla", 0))) {
+        printf("Failed to add property. Error %d", error);
         destroy_collection(peer);
         return error;
     }
 
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
 
     printf("Creating HOST collection.\n");
 
-    if((error=create_collection(&host,"host",0)) ||
-       (error=add_str_property(host,NULL,"hostname","myhost.mytest.com",0)) ||
-       (error=add_str_property(host,NULL,"IPv4","20.20.20.20",13)) ||
-       (error=add_str_property(host,NULL,"IPv6","bla:bla:bla:bla:bla:bla",0)) ||
-       (error=add_double_property(host,NULL,"double",0.253545))) {
-        printf("Failed to add property. Error %d",error);
+    if ((error = create_collection(&host, "host", 0)) ||
+        (error = add_str_property(host, NULL, "hostname", "myhost.mytest.com", 0)) ||
+        (error = add_str_property(host, NULL, "IPv4", "20.20.20.20", 13)) ||
+        (error = add_str_property(host, NULL, "IPv6", "bla:bla:bla:bla:bla:bla", 0)) ||
+        (error = add_double_property(host, NULL, "double", 0.253545))) {
+        printf("Failed to add property. Error %d", error);
         destroy_collection(peer);
         destroy_collection(host);
         return error;
     }
 
-    debug_collection(host,COL_TRAVERSE_DEFAULT);
+    debug_collection(host, COL_TRAVERSE_DEFAULT);
 
     printf("Creating SOCKET1 collection.\n");
 
-    if((error=create_collection(&socket1,"socket1",0)) ||
-       (error=add_int_property(socket1,NULL,"id",1)) ||
-       (error=add_long_property(socket1,NULL,"packets",100000000L)) ||
-       (error=add_binary_property(socket1,NULL,"stack",binary_dump,sizeof(binary_dump)))) {
+    if ((error = create_collection(&socket1, "socket1", 0)) ||
+        (error = add_int_property(socket1, NULL, "id", 1)) ||
+        (error = add_long_property(socket1, NULL, "packets", 100000000L)) ||
+        (error = add_binary_property(socket1, NULL, "stack", binary_dump, sizeof(binary_dump)))) {
         destroy_collection(peer);
         destroy_collection(host);
         destroy_collection(socket1);
-        printf("Failed to add property. Error %d\n",error);
+        printf("Failed to add property. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket1,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket1, COL_TRAVERSE_DEFAULT);
     printf("Creating a copy of SOCKET1 collection named SOCKET2.\n");
 
-    error = copy_collection(&socket2,socket1,"socket2");
-    if(error) {
+    error = copy_collection(&socket2, socket1, "socket2");
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         destroy_collection(socket1);
-        printf("Failed to copy collection. Error %d\n",error);
+        printf("Failed to copy collection. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket2,COL_TRAVERSE_DEFAULT);
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket2, COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
 
     printf("Adding PEER collection to SOCKET2 collection as a reference named PEER2\n");
 
     /* Embed peer host into the socket2 as reference */
-    error = add_collection_to_collection(socket2,NULL,"peer2",peer,COL_ADD_MODE_REFERENCE);
-    if(error) {
+    error = add_collection_to_collection(socket2, NULL, "peer2", peer, COL_ADD_MODE_REFERENCE);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         destroy_collection(socket1);
         destroy_collection(socket2);
-        printf("Failed to create collection. Error %d\n",error);
+        printf("Failed to create collection. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket2,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket2, COL_TRAVERSE_DEFAULT);
 
     printf("Creating an EVENT collection.\n");
 
     /* Construct event */
-    error = create_collection(&event,"event",0);
-    if(error) {
+    error = create_collection(&event, "event", 0);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         destroy_collection(socket1);
         destroy_collection(socket2);
-        printf("Failed to create collection. Error %d\n",error);
+        printf("Failed to create collection. Error %d\n", error);
         return error;
     }
 
-    debug_collection(event,COL_TRAVERSE_DEFAULT);
+    debug_collection(event, COL_TRAVERSE_DEFAULT);
 
     printf("Adding HOST to EVENT.\n");
 
     /* Add host to event */
-    error = add_collection_to_collection(event,NULL,NULL,host,COL_ADD_MODE_REFERENCE);
-    if(error) {
+    error = add_collection_to_collection(event, NULL, NULL, host, COL_ADD_MODE_REFERENCE);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         destroy_collection(socket1);
         destroy_collection(socket2);
-        printf("Failed to add collections. Error %d\n",error);
+        printf("Failed to add collections. Error %d\n", error);
         return error;
     }
 
-    debug_collection(event,COL_TRAVERSE_DEFAULT);
+    debug_collection(event, COL_TRAVERSE_DEFAULT);
 
     printf("Embed SOCKET1 into EVENT.\n");
     /* Donate socket1 to event */
     /* Socket1 should not be used after this */
-    error = add_collection_to_collection(event,NULL,NULL,socket1,COL_ADD_MODE_EMBED);
-    if(error) {
+    error = add_collection_to_collection(event, NULL, NULL, socket1, COL_ADD_MODE_EMBED);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         destroy_collection(socket1);
         destroy_collection(socket2);
-        printf("Failed to add collections. Error %d\n",error);
+        printf("Failed to add collections. Error %d\n", error);
         return error;
     }
 
     printf("Traverse one level:\n");
-    debug_collection(event,COL_TRAVERSE_ONELEVEL);
+    debug_collection(event, COL_TRAVERSE_ONELEVEL);
     printf("Traverse ignore subcollections:\n");
-    debug_collection(event,COL_TRAVERSE_IGNORE);
+    debug_collection(event, COL_TRAVERSE_IGNORE);
     printf("Traverse normal:\n");
-    debug_collection(event,COL_TRAVERSE_DEFAULT);
-    debug_collection(socket1,COL_TRAVERSE_DEFAULT);
+    debug_collection(event, COL_TRAVERSE_DEFAULT);
+    debug_collection(socket1, COL_TRAVERSE_DEFAULT);
 
     printf("SOCKET1 MUST NO BE USED AFTER THIS POINT!!!\n");
     socket1 = (struct collection_item *)(NULL);
 
     printf("Add collection PEER as PEER1 to subcollection SOCKET1 of the EVENT.\n");
 
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
 
-    error = add_collection_to_collection(event,"socket1","peer1",peer,COL_ADD_MODE_CLONE);
-    if(error) {
+    error = add_collection_to_collection(event, "socket1", "peer1", peer, COL_ADD_MODE_CLONE);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         /* No socket1 any more :) */
         destroy_collection(socket2);
-        printf("Failed to add collections. Error %d\n",error);
+        printf("Failed to add collections. Error %d\n", error);
         return error;
     }
 
-    debug_collection(event,COL_TRAVERSE_DEFAULT);
+    debug_collection(event, COL_TRAVERSE_DEFAULT);
 
     printf("Add property named TIMEOUT to PEER collection.\n");
 
     /* Add new property to the peer collection */
-    error = add_int_property(peer,NULL,"timeout",5);
-    if(error) {
+    error = add_int_property(peer, NULL, "timeout", 5);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         /* No socket1 any more :) */
         destroy_collection(socket2);
-        printf("Failed to add property. Error %d\n",error);
+        printf("Failed to add property. Error %d\n", error);
         return error;
     }
 
-    debug_collection(socket2,COL_TRAVERSE_DEFAULT);
+    debug_collection(socket2, COL_TRAVERSE_DEFAULT);
 
     printf("Add property named DELAY to PEER1 collection.\n");
 
-    error = add_int_property(event,"peer1","delay",10);
-    if(error) {
+    error = add_int_property(event, "peer1", "delay", 10);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         /* No socket1 any more :) */
         destroy_collection(socket2);
-        printf("Failed to add property. Error %d\n",error);
+        printf("Failed to add property. Error %d\n", error);
         return error;
     }
 
-    debug_collection(event,COL_TRAVERSE_DEFAULT);
-    debug_collection(host,COL_TRAVERSE_DEFAULT);
+    debug_collection(event, COL_TRAVERSE_DEFAULT);
+    debug_collection(host, COL_TRAVERSE_DEFAULT);
 
     printf("Check if property PEER1.DELAY is in the EVENT collection.\n");
 
     /* Check if the property in the collection */
     found = 0;
     error = is_item_in_collection(event, "peer1.delay", COL_TYPE_ANY, COL_TRAVERSE_DEFAULT, &found);
-    if(error) {
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         /* No socket1 any more :) */
         destroy_collection(socket2);
-        printf("Failed to check property. Error %d\n",error);
+        printf("Failed to check property. Error %d\n", error);
         return error;
     }
 
@@ -435,20 +438,20 @@ int mixed_collection_test()
 
     /* Traverse collection */
     error = print_collection2(event);
-    if(error) {
-        printf("Error printing collection %d\n",error);
+    if (error) {
+        printf("Error printing collection %d\n", error);
         return error;
     }
 
     printf("Delete property PEER1.DELAY from the EVENT collection.\n");
 
-    error = delete_property(event,"peer1.delay",COL_TYPE_ANY, COL_TRAVERSE_DEFAULT);
-    if(error) {
+    error = delete_property(event, "peer1.delay", COL_TYPE_ANY, COL_TRAVERSE_DEFAULT);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(host);
         /* No socket1 any more :) */
         destroy_collection(socket2);
-        printf("Failed to delete property. Error %d\n",error);
+        printf("Failed to delete property. Error %d\n", error);
         return error;
     }
 
@@ -456,15 +459,15 @@ int mixed_collection_test()
 
     /* Traverse collection */
     error = print_collection2(event);
-    if(error) {
-        printf("Error printing collection %d\n",error);
+    if (error) {
+        printf("Error printing collection %d\n", error);
         return error;
     }
     printf("Debugging EVENT.\n");
 
-    error = debug_collection(event,COL_TRAVERSE_DEFAULT);
-    if(error) {
-        printf("Error printing collection %d\n",error);
+    error = debug_collection(event, COL_TRAVERSE_DEFAULT);
+    if (error) {
+        printf("Error printing collection %d\n", error);
         return error;
     }
 
@@ -479,25 +482,25 @@ int mixed_collection_test()
 
     /* Traverse collection again - peer should still be there */
     error = print_collection(event);
-    if(error) {
+    if (error) {
         destroy_collection(event);
-        printf("Error printing collection %d\n",error);
+        printf("Error printing collection %d\n", error);
         return error;
     }
 
     printf("Debugging EVENT again.\n");
 
-    error = debug_collection(event,COL_TRAVERSE_DEFAULT);
-    if(error) {
+    error = debug_collection(event, COL_TRAVERSE_DEFAULT);
+    if (error) {
         destroy_collection(event);
-        printf("Error printing collection %d\n",error);
+        printf("Error printing collection %d\n", error);
         return error;
     }
 
     printf("Attempt to add property to a referenced collection.\n");
 
-    error = add_int_property(event,"host","session",500);
-    if(error) {
+    error = add_int_property(event, "host", "session", 500);
+    if (error) {
         destroy_collection(event);
         printf("Error was NOT able to add property to a referenced collection %d.\n", error);
         return error;
@@ -506,31 +509,31 @@ int mixed_collection_test()
     printf("Attempt to delete non-existent property.\n");
 
     /* Can't delete non exitent property */
-    error = delete_property(event,"host.host",COL_TYPE_ANY, COL_TRAVERSE_DEFAULT);
-    if(error == 0) {
+    error = delete_property(event, "host.host", COL_TYPE_ANY, COL_TRAVERSE_DEFAULT);
+    if (error == 0) {
         destroy_collection(event);
         printf("Error was able to delete property that does not exist.\n");
         return -1;
     }
-    else printf("Expected error %d\n",error);
+    else printf("Expected error %d\n", error);
 
     /* Set collection class */
-    error = set_collection_class(event,2);
-    if(error != 0) {
+    error = set_collection_class(event, 2);
+    if (error != 0) {
         destroy_collection(event);
         printf("Error was NOT able to set class.\n");
         return error;
     }
 
-    error = get_collection_class(event,&class);
-    if(error != 0) {
+    error = get_collection_class(event, &class);
+    if (error != 0) {
         destroy_collection(event);
         printf("Error was NOT able to get class.\n");
         return error;
     }
-    else printf("Class = %d\n",class);
+    else printf("Class = %d\n", class);
 
-    if(is_of_class(event,2)) printf("Class mathced!\n");
+    if (is_of_class(event, 2)) printf("Class mathced!\n");
     else {
         destroy_collection(event);
         printf("Error - bad class.\n");
@@ -542,7 +545,7 @@ int mixed_collection_test()
     destroy_collection(event);
 
     printf("Exit.\n");
-    TRACE_FLOW_NUMBER("add_collection_test. Returning",EOK);
+    TRACE_FLOW_NUMBER("add_collection_test. Returning", EOK);
     return EOK;
 }
 
@@ -560,63 +563,64 @@ int iterator_test()
 
     printf("\n\n==== ITERATOR TEST ====\n\n");
 
-    if((error=create_collection(&peer,"peer",0)) ||
-       (error=add_str_property(peer,NULL,"hostname","peerhost.mytest.com",0)) ||
-       (error=add_str_property(peer,NULL,"IPv4","10.10.10.10",12)) || /* Expect trailing zero to be truncated */
-       (error=add_str_property(peer,NULL,"IPv6","bla:bla:bla:bla:bla:bla",0))) {
-        printf("Failed to add property. Error %d",error);
+    if ((error = create_collection(&peer, "peer", 0)) ||
+        (error = add_str_property(peer, NULL, "hostname", "peerhost.mytest.com", 0)) ||
+        /* Expect trailing zero to be truncated */
+        (error = add_str_property(peer, NULL, "IPv4", "10.10.10.10", 12)) ||
+        (error = add_str_property(peer, NULL, "IPv6", "bla:bla:bla:bla:bla:bla", 0))) {
+        printf("Failed to add property. Error %d", error);
         destroy_collection(peer);
         return error;
     }
 
-    if((error=create_collection(&socket1,"socket",0)) ||
-       (error=add_int_property(socket1,NULL,"id",1)) ||
-       (error=add_long_property(socket1,NULL,"packets",100000000L)) ||
-       (error=add_binary_property(socket1,NULL,"stack",binary_dump,sizeof(binary_dump)))) {
+    if ((error = create_collection(&socket1, "socket", 0)) ||
+        (error = add_int_property(socket1, NULL, "id", 1)) ||
+        (error = add_long_property(socket1, NULL, "packets", 100000000L)) ||
+        (error = add_binary_property(socket1, NULL, "stack", binary_dump, sizeof(binary_dump)))) {
         destroy_collection(peer);
         destroy_collection(socket1);
-        printf("Failed to add property. Error %d\n",error);
+        printf("Failed to add property. Error %d\n", error);
         return error;
     }
 
-    if((error=create_collection(&socket2,"socket",0)) ||
-       (error=add_int_property(socket2,NULL,"id",2)) ||
-       (error=add_long_property(socket2,NULL,"packets",200000000L)) ||
-       (error=add_binary_property(socket2,NULL,"queue",binary_dump,sizeof(binary_dump)))) {
+    if ((error = create_collection(&socket2, "socket", 0)) ||
+        (error = add_int_property(socket2, NULL, "id", 2)) ||
+        (error = add_long_property(socket2, NULL, "packets", 200000000L)) ||
+        (error = add_binary_property(socket2, NULL, "queue", binary_dump, sizeof(binary_dump)))) {
         destroy_collection(peer);
         destroy_collection(socket1);
         destroy_collection(socket2);
-        printf("Failed to add property. Error %d\n",error);
+        printf("Failed to add property. Error %d\n", error);
         return error;
     }
 
-    error = add_collection_to_collection(peer,NULL,"first",socket1,COL_ADD_MODE_EMBED);
-    if(error) {
+    error = add_collection_to_collection(peer, NULL, "first", socket1, COL_ADD_MODE_EMBED);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(socket1);
         destroy_collection(socket2);
-        printf("Failed to add collection to collection. Error %d\n",error);
+        printf("Failed to add collection to collection. Error %d\n", error);
         return error;
     }
 
-    error = add_collection_to_collection(peer,NULL,"second",socket2,COL_ADD_MODE_EMBED);
-    if(error) {
+    error = add_collection_to_collection(peer, NULL, "second", socket2, COL_ADD_MODE_EMBED);
+    if (error) {
         destroy_collection(peer);
         destroy_collection(socket2);
-        printf("Failed to add collection to collection. Error %d\n",error);
+        printf("Failed to add collection to collection. Error %d\n", error);
         return error;
     }
 
     /* Bind iterator */
-    error =  bind_iterator(&iterator,peer,COL_TRAVERSE_DEFAULT);
-    if(error) {
-        printf("Error (bind): %d\n",error);
+    error =  bind_iterator(&iterator, peer, COL_TRAVERSE_DEFAULT);
+    if (error) {
+        printf("Error (bind): %d\n", error);
         destroy_collection(peer);
         return error;
     }
 
     printf("\n\nCollection:\n\n");
-    debug_collection(peer,COL_TRAVERSE_DEFAULT);
+    debug_collection(peer, COL_TRAVERSE_DEFAULT);
 
     /* This should also work becuase iterator holds to collection */
     destroy_collection(peer);
@@ -625,60 +629,60 @@ int iterator_test()
 
     do {
         depth = 0;
-        get_iterator_depth(iterator,&depth);
+        get_iterator_depth(iterator, &depth);
 
         /* Loop through a collection */
         error = iterate_collection(iterator, &item);
-        if(error) {
-            printf("Error (iterate): %d\n",error);
+        if (error) {
+            printf("Error (iterate): %d\n", error);
             unbind_iterator(iterator);
             return error;
         }
 
         /* Are we done ? */
-        if(item == (struct collection_item *)(NULL)) break;
+        if (item == (struct collection_item *)(NULL)) break;
 
         printf("%*s Property (%s), type = %d, data size = %d\n",
                 depth * 4,  "",
-                get_item_property(item,NULL),
+                get_item_property(item, NULL),
                 get_item_type(item),
                 get_item_length(item));
 
-        if((strcmp(get_item_property(item,NULL),"id")==0) &&
+        if ((strcmp(get_item_property(item, NULL), "id")==0) &&
            (*((int *)(get_item_data(item))) == 1)) {
             printf("\n\nFound property we need - go up!!!\n\n\n");
-            error = iterate_up(iterator,5);
-            if(!error) {
+            error = iterate_up(iterator, 5);
+            if (!error) {
                 printf("We expected error but got seucces - bad.\n");
                 unbind_iterator(iterator);
                 return -1;
             }
             /* This should work! */
-            error = iterate_up(iterator,1);
-            if(error) {
-                printf("We expected success but got error %d\n",error);
+            error = iterate_up(iterator, 1);
+            if (error) {
+                printf("We expected success but got error %d\n", error);
                 unbind_iterator(iterator);
                 return error;
             }
 
-            if((error = modify_str_item(item,"id2","test",0)) ||
-               (error = debug_item(item)) ||
-               (error = modify_str_item(item,NULL,"test",2)) ||
-               (error = debug_item(item)) ||
-               (error = modify_binary_item(item,NULL,binary_dump,sizeof(binary_dump))) ||
-               (error = debug_item(item)) ||
-               (error = modify_bool_item(item,NULL,1)) ||
-               (error = debug_item(item)) ||
-               (error = modify_int_item(item,"int",1)) ||
-               (error = debug_item(item)) ||
-               (error = modify_long_item(item,"long",1000000000L)) ||
-               (error = debug_item(item)) ||
-               (error = modify_ulong_item(item,"ulong",4000000000UL)) ||
-               (error = debug_item(item)) ||
-               (error = modify_unsigned_item(item,"unsigned",4000000000U)) ||
-               (error = debug_item(item)) ||
-               (error = modify_double_item(item,"double",-1.1)) ||
-               (error = debug_item(item))) {
+            if ((error = modify_str_item(item, "id2", "test", 0)) ||
+                (error = debug_item(item)) ||
+                (error = modify_str_item(item, NULL, "test", 2)) ||
+                (error = debug_item(item)) ||
+                (error = modify_binary_item(item, NULL, binary_dump, sizeof(binary_dump))) ||
+                (error = debug_item(item)) ||
+                (error = modify_bool_item(item, NULL, 1)) ||
+                (error = debug_item(item)) ||
+                (error = modify_int_item(item, "int", 1)) ||
+                (error = debug_item(item)) ||
+                (error = modify_long_item(item, "long", 1000000000L)) ||
+                (error = debug_item(item)) ||
+                (error = modify_ulong_item(item, "ulong", 4000000000UL)) ||
+                (error = debug_item(item)) ||
+                (error = modify_unsigned_item(item, "unsigned", 4000000000U)) ||
+                (error = debug_item(item)) ||
+                (error = modify_double_item(item, "double", -1.1)) ||
+                (error = debug_item(item))) {
                 printf("Failed to change property.\n");
                 return error;
             }
@@ -702,141 +706,166 @@ int insert_extract_test()
     printf("\n\n==== INSERTION TEST ====\n\n");
 
     if ((error = create_collection(&col, "insertion", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_END,
+         (error = insert_str_property(col, NULL, COL_DSP_END,
                                      NULL, 0, COL_INSERT_NOCHECK,
                                      "property1", "value1", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_END,
+         (error = insert_str_property(col, NULL, COL_DSP_END,
                                      NULL, 0, COL_INSERT_NOCHECK,
                                      "property2", "value2", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_FRONT,
+         (error = insert_str_property(col, NULL, COL_DSP_FRONT,
                                      NULL, 0, COL_INSERT_NOCHECK,
                                      "property0", "value0", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_BEFORE,
+         (error = insert_str_property(col, NULL, COL_DSP_BEFORE,
                                      "property0", 0, COL_INSERT_NOCHECK,
                                      "property_-1", "value_-1", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_BEFORE,
+         (error = insert_str_property(col, NULL, COL_DSP_BEFORE,
                                      "property1", 0, COL_INSERT_NOCHECK,
                                      "property0_5", "value0_5", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_BEFORE,
+         (error = insert_str_property(col, NULL, COL_DSP_BEFORE,
                                      "property2", 0, COL_INSERT_NOCHECK,
                                      "property1_5", "value1_5", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_AFTER,
+         (error = insert_str_property(col, NULL, COL_DSP_AFTER,
                                      "property_-1", 0, COL_INSERT_NOCHECK,
                                      "property_-0_5", "value_-0_5", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_AFTER,
+         (error = insert_str_property(col, NULL, COL_DSP_AFTER,
                                      "property1_5", 0, COL_INSERT_NOCHECK,
                                      "property1_6", "value1_6", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_INDEX,
+         (error = insert_str_property(col, NULL, COL_DSP_INDEX,
                                      NULL, 10, COL_INSERT_NOCHECK,
                                      "property10", "value10", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_INDEX,
+         (error = insert_str_property(col, NULL, COL_DSP_INDEX,
                                      NULL, 0, COL_INSERT_NOCHECK,
                                      "property_-2", "value_-2", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_INDEX,
+         (error = insert_str_property(col, NULL, COL_DSP_INDEX,
                                      NULL, 1, COL_INSERT_NOCHECK,
                                      "property_-1_5", "value_-1_5", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_FIRSTDUP,
+         (error = insert_str_property(col, NULL, COL_DSP_FIRSTDUP,
                                      NULL, 0, COL_INSERT_NOCHECK,
                                      "property0", "value0firstdup", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_LASTDUP,
+         (error = insert_str_property(col, NULL, COL_DSP_LASTDUP,
                                      NULL, 0, COL_INSERT_NOCHECK,
                                      "property0", "value0lastdup", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_NDUP,
+         (error = insert_str_property(col, NULL, COL_DSP_NDUP,
                                      NULL, 1, COL_INSERT_NOCHECK,
                                      "property0", "value0middledup", 0)) ||
-        (error = insert_str_property(col, NULL, 0,
+         (error = insert_str_property(col, NULL, 0,
                                      NULL, 0, COL_INSERT_DUPOVER ,
                                      "property0", "value0firstdupupdate", 0)) ||
-        (error = insert_str_property(col, NULL, 0,
+         (error = insert_str_property(col, NULL, 0,
                                      NULL, 0, COL_INSERT_DUPOVERT,
                                      "property1", "value1update", 0)) ||
         ((error = insert_str_property(col, NULL, 0,
                                        NULL, 0, COL_INSERT_DUPERROR,
                                        "property0", "does not matter", 0)) != EEXIST) ||
-        (error = insert_str_property(col, NULL, COL_DSP_NDUP,
+         (error = insert_str_property(col, NULL, COL_DSP_NDUP,
                                      NULL, 5, COL_INSERT_NOCHECK,
                                      "property10", "value10dup", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_LASTDUP,
+         (error = insert_str_property(col, NULL, COL_DSP_LASTDUP,
                                      NULL, 0, COL_INSERT_NOCHECK,
                                      "property10", "value10lastdup", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_END,
+         (error = insert_str_property(col, NULL, COL_DSP_END,
                                      NULL, 0, COL_INSERT_DUPMOVET,
                                      "property_-2", "value-2moved_to_bottom", 0)) ||
-        (error = insert_str_property(col, NULL, COL_DSP_FRONT,
+         (error = insert_str_property(col, NULL, COL_DSP_FRONT,
                                      NULL, 0, COL_INSERT_DUPMOVE,
                                      "property1_6", "value_1_6_moved_moved_to_front", 0))) {
 
         printf("ERROR in the ITERATION TEST\n");
-        debug_collection(col,COL_TRAVERSE_DEFAULT);
+        debug_collection(col, COL_TRAVERSE_DEFAULT);
         destroy_collection(col);
         return error;
     }
 
     printf("\n\nCollection:\n\n");
-    debug_collection(col,COL_TRAVERSE_DEFAULT);
+    debug_collection(col, COL_TRAVERSE_DEFAULT);
 
 
     printf("\n\n==== EXTRACTION TEST ====\n\n");
 
     if ((error = create_collection(&col2, "extraction", 0)) ||
+
         (error = extract_item(col, NULL, COL_DSP_FRONT,
                               NULL, 0, 0, &item)) ||
+
         (error = insert_item(col2, NULL, item, COL_DSP_FRONT,
-                              NULL, 0, COL_INSERT_NOCHECK)) ||
-        (debug_collection(col2,COL_TRAVERSE_DEFAULT)) ||
+                             NULL, 0, COL_INSERT_NOCHECK)) ||
+
+        (debug_collection(col2, COL_TRAVERSE_DEFAULT)) ||
+
         (error = extract_item(col, NULL, COL_DSP_END,
                               NULL, 0, 0, &item)) ||
+
         (error = insert_item(col2, NULL, item, COL_DSP_END,
                               NULL, 0, COL_INSERT_NOCHECK)) ||
-        (debug_collection(col2,COL_TRAVERSE_DEFAULT)) ||
+
+        (debug_collection(col2, COL_TRAVERSE_DEFAULT)) ||
+
         (error = insert_str_property(col, NULL, COL_DSP_INDEX,
                                      NULL, 100, COL_INSERT_NOCHECK,
                                      "property100", "value100", 0)) ||
+
         (error = extract_item(col, NULL, COL_DSP_AFTER,
                               "property10", 0, COL_TYPE_STRING, &item)) ||
+
         (error = insert_item(col2, NULL, item, COL_DSP_END,
-                              NULL, 0, COL_INSERT_NOCHECK)) ||
-        (debug_collection(col2,COL_TRAVERSE_DEFAULT)) ||
+                             NULL, 0, COL_INSERT_NOCHECK)) ||
+
+        (debug_collection(col2, COL_TRAVERSE_DEFAULT)) ||
+
         (error = extract_item(col, NULL, COL_DSP_BEFORE,
                               "property0", 0, COL_TYPE_STRING, &item)) ||
+
         (error = insert_item(col2, NULL, item, COL_DSP_END,
-                              NULL, 0, COL_INSERT_NOCHECK)) ||
-        (debug_collection(col2,COL_TRAVERSE_DEFAULT)) ||
+                             NULL, 0, COL_INSERT_NOCHECK)) ||
+
+        (debug_collection(col2, COL_TRAVERSE_DEFAULT)) ||
+
         (error = extract_item(col, NULL, COL_DSP_INDEX,
                               NULL, 1, 0, &item)) ||
+
         (error = insert_item(col2, NULL, item, COL_DSP_END,
-                              NULL, 0, COL_INSERT_NOCHECK)) ||
-        (debug_collection(col2,COL_TRAVERSE_DEFAULT)) ||
+                             NULL, 0, COL_INSERT_NOCHECK)) ||
+
+        (debug_collection(col2, COL_TRAVERSE_DEFAULT)) ||
+
         (error = extract_item(col, NULL, COL_DSP_NDUP,
                               "property0", 1, 0, &item)) ||
+
         (error = insert_item(col2, NULL, item, COL_DSP_END,
-                              NULL, 0, COL_INSERT_NOCHECK)) ||
-        (debug_collection(col2,COL_TRAVERSE_DEFAULT)) ||
+                             NULL, 0, COL_INSERT_NOCHECK)) ||
+
+        (debug_collection(col2, COL_TRAVERSE_DEFAULT)) ||
+
         (error = extract_item(col, NULL, COL_DSP_LASTDUP,
                               "property0", 0, 0, &item)) ||
+
         (error = insert_item(col2, NULL, item, COL_DSP_END,
-                              NULL, 0, COL_INSERT_NOCHECK)) ||
-        (debug_collection(col2,COL_TRAVERSE_DEFAULT)) ||
+                             NULL, 0, COL_INSERT_NOCHECK)) ||
+
+        (debug_collection(col2, COL_TRAVERSE_DEFAULT)) ||
+
         (error = extract_item(col, NULL, COL_DSP_FIRSTDUP,
                               "property0", 0, 0, &item)) ||
+
         (error = insert_item(col2, NULL, item, COL_DSP_END,
-                              NULL, 0, COL_INSERT_NOCHECK)) ||
-        (debug_collection(col2,COL_TRAVERSE_DEFAULT))) {
+                             NULL, 0, COL_INSERT_NOCHECK)) ||
+
+        (debug_collection(col2, COL_TRAVERSE_DEFAULT))) {
 
         printf("ERROR in the EXTRACTION TEST\n");
         printf("Collection 1\n");
-        debug_collection(col,COL_TRAVERSE_DEFAULT);
+        debug_collection(col, COL_TRAVERSE_DEFAULT);
         printf("Collection 2\n");
-        debug_collection(col2,COL_TRAVERSE_DEFAULT);
+        debug_collection(col2, COL_TRAVERSE_DEFAULT);
         destroy_collection(col);
         destroy_collection(col2);
         return error;
     }
 
     printf("Collection 1\n");
-    debug_collection(col,COL_TRAVERSE_DEFAULT);
+    debug_collection(col, COL_TRAVERSE_DEFAULT);
     printf("Collection 2\n");
-    debug_collection(col2,COL_TRAVERSE_DEFAULT);
+    debug_collection(col2, COL_TRAVERSE_DEFAULT);
 
     destroy_collection(col2);
     destroy_collection(col);
@@ -853,12 +882,12 @@ int main()
     int error = 0;
 
     printf("Start\n");
-    if((error=ref_collection_test()) ||
-       (error=single_collection_test()) ||
-       (error=add_collection_test()) ||
-       (error=mixed_collection_test()) ||
-       (error=iterator_test()) ||
-       (error=insert_extract_test())) {
+    if ((error = ref_collection_test()) ||
+        (error = single_collection_test()) ||
+        (error = add_collection_test()) ||
+        (error = mixed_collection_test()) ||
+        (error = iterator_test()) ||
+        (error = insert_extract_test())) {
         printf("Failed!\n");
     }
     else printf("Success!\n");