- code format updates

src/common/conversions.c

@@ -306,7 +306,3 @@ memcpyReverseByteOrder(uint8_t* dst, const uint8_t* src, int size)
         dst[i] = src[size - i - 1];
     }
 }
-
-
-
-

src/common/linked_list.c

@@ -25,37 +25,44 @@
 #include "linked_list.h"
 
 LinkedList
-LinkedList_getLastElement(LinkedList list)
+LinkedList_getLastElement(LinkedList self)
 {
-    while (list->next != NULL) {
-        list = list->next;
+    while (self->next != NULL) {
+        self = self->next;
     }
-    return list;
+
+    return self;
 }
 
 LinkedList
 LinkedList_create()
 {
-    LinkedList newList;
+    LinkedList self;
+
+    self = (LinkedList) GLOBAL_MALLOC(sizeof(struct sLinkedList));
 
-    newList = (LinkedList) GLOBAL_MALLOC(sizeof(struct sLinkedList));
-    newList->data = NULL;
-    newList->next = NULL;
+    if (self)
+    {
+        self->data = NULL;
+        self->next = NULL;
+    }
 
-    return newList;
+    return self;
 }
 
 /**
  * Destroy list (free). Also frees element data with helper function.
  */
 void
-LinkedList_destroyDeep(LinkedList list, LinkedListValueDeleteFunction valueDeleteFunction)
+LinkedList_destroyDeep(LinkedList self, LinkedListValueDeleteFunction valueDeleteFunction)
 {
-    if (list) {
-        LinkedList nextElement = list;
+    if (self)
+    {
+        LinkedList nextElement = self;
         LinkedList currentElement;
 
-        do {
+        do
+        {
             currentElement = nextElement;
             nextElement = currentElement->next;
 
@@ -69,21 +76,22 @@ LinkedList_destroyDeep(LinkedList list, LinkedListValueDeleteFunction valueDelet
 }
 
 void
-LinkedList_destroy(LinkedList list)
+LinkedList_destroy(LinkedList self)
 {
-    LinkedList_destroyDeep(list, Memory_free);
+    LinkedList_destroyDeep(self, Memory_free);
 }
 
 /**
  * Destroy list (free) without freeing the element data
  */
 void
-LinkedList_destroyStatic(LinkedList list)
+LinkedList_destroyStatic(LinkedList self)
 {
-    LinkedList nextElement = list;
+    LinkedList nextElement = self;
     LinkedList currentElement;
 
-    do {
+    do
+    {
         currentElement = nextElement;
         nextElement = currentElement->next;
         GLOBAL_FREEMEM(currentElement);
@@ -92,12 +100,13 @@ LinkedList_destroyStatic(LinkedList list)
 }
 
 int
-LinkedList_size(LinkedList list)
+LinkedList_size(LinkedList self)
 {
-    LinkedList nextElement = list;
+    LinkedList nextElement = self;
     int size = 0;
 
-    while (nextElement->next != NULL) {
+    while (nextElement->next != NULL)
+    {
         nextElement = nextElement->next;
         size++;
     }
@@ -106,23 +115,24 @@ LinkedList_size(LinkedList list)
 }
 
 void
-LinkedList_add(LinkedList list, void* data)
+LinkedList_add(LinkedList self, void* data)
 {
     LinkedList newElement = LinkedList_create();
 
     newElement->data = data;
 
-    LinkedList listEnd = LinkedList_getLastElement(list);
+    LinkedList listEnd = LinkedList_getLastElement(self);
 
     listEnd->next = newElement;
 }
 
 bool
-LinkedList_contains(LinkedList list, void* data)
+LinkedList_contains(LinkedList self, void* data)
 {
-    LinkedList currentElement = list->next;
+    LinkedList currentElement = self->next;
 
-    while (currentElement != NULL) {
+    while (currentElement != NULL)
+    {
         if (currentElement->data == data)
             return true;
 
@@ -133,14 +143,16 @@ LinkedList_contains(LinkedList list, void* data)
 }
 
 bool
-LinkedList_remove(LinkedList list, void* data)
+LinkedList_remove(LinkedList self, void* data)
 {
-    LinkedList lastElement = list;
+    LinkedList lastElement = self;
 
-    LinkedList currentElement = list->next;
+    LinkedList currentElement = self->next;
 
-    while (currentElement != NULL) {
-        if (currentElement->data == data) {
+    while (currentElement != NULL)
+    {
+        if (currentElement->data == data)
+        {
             lastElement->next = currentElement->next;
             GLOBAL_FREEMEM(currentElement);
             return true;
@@ -154,34 +166,36 @@ LinkedList_remove(LinkedList list, void* data)
 }
 
 LinkedList
-LinkedList_insertAfter(LinkedList list, void* data)
+LinkedList_insertAfter(LinkedList self, void* data)
 {
     LinkedList newElement = LinkedList_create();
 
-    if (newElement) {
+    if (newElement)
+    {
         newElement->data = data;
-        newElement->next = LinkedList_getNext(list);
+        newElement->next = LinkedList_getNext(self);
 
-        list->next = newElement;
+        self->next = newElement;
     }
 
     return newElement;
 }
 
 LinkedList
-LinkedList_getNext(LinkedList list)
+LinkedList_getNext(LinkedList self)
 {
-    return list->next;
+    return self->next;
 }
 
 LinkedList
-LinkedList_get(LinkedList list, int index)
+LinkedList_get(LinkedList self, int index)
 {
-    LinkedList element = LinkedList_getNext(list);
+    LinkedList element = LinkedList_getNext(self);
 
     int i = 0;
 
-    while (i < index) {
+    while (i < index)
+    {
         element = LinkedList_getNext(element);
 
         if (element == NULL)
@@ -200,11 +214,12 @@ LinkedList_getData(LinkedList self)
 }
 
 void
-LinkedList_printStringList(LinkedList list)
+LinkedList_printStringList(LinkedList self)
 {
-    LinkedList element = list;
+    LinkedList element = self;
 
-    while ((element = LinkedList_getNext(element)) != NULL) {
+    while ((element = LinkedList_getNext(element)) != NULL)
+    {
         char* str = (char*) (element->data);
         printf("%s\n", str);
     }

src/common/map.c

@@ -73,10 +73,12 @@ Map_removeEntry(Map map, void* key, bool deleteKey)
     MapEntry* entry;
     void* value = NULL;
 
-    while ((element = LinkedList_getNext(element)) != NULL) {
+    while ((element = LinkedList_getNext(element)) != NULL)
+    {
         entry = (MapEntry*) element->data;
 
-        if (map->compareKeys(key, entry->key) == 0) {
+        if (map->compareKeys(key, entry->key) == 0)
+        {
             lastElement->next = element->next;
             value = entry->value;
 
@@ -99,11 +101,13 @@ Map_getEntry(Map map, void* key)
 {
     LinkedList element = map->entries;
 
-    while ((element = LinkedList_getNext(element)) != NULL) {
+    while ((element = LinkedList_getNext(element)) != NULL)
+    {
         MapEntry* entry = (MapEntry*) element->data;
+
         if (map->compareKeys(key, entry->key) == 0) {
             return entry->value;
-        };
+        }
     }
 
     return NULL;
@@ -114,10 +118,13 @@ Map_delete(Map map, bool deleteKey)
 {
     LinkedList element = map->entries;
 
-    while ((element = LinkedList_getNext(element)) != NULL) {
+    while ((element = LinkedList_getNext(element)) != NULL)
+    {
         MapEntry* entry = (MapEntry*) element->data;
+
         if (deleteKey == true)
             GLOBAL_FREEMEM(entry->key);
+
         GLOBAL_FREEMEM(entry->value);
     }
 
@@ -130,8 +137,10 @@ Map_deleteStatic(Map map, bool deleteKey)
 {
     LinkedList element = map->entries;
 
-    if (deleteKey == true) {
-        while ((element = LinkedList_getNext(element)) != NULL) {
+    if (deleteKey == true)
+    {
+        while ((element = LinkedList_getNext(element)) != NULL)
+        {
             MapEntry* entry = (MapEntry*) element->data;
             GLOBAL_FREEMEM(entry->key);
         }
@@ -144,13 +153,17 @@ Map_deleteStatic(Map map, bool deleteKey)
 void
 Map_deleteDeep(Map map, bool deleteKey, void (*valueDeleteFunction)(void*))
 {
-    if (map) {
+    if (map)
+    {
         LinkedList element = map->entries;
 
-        while ((element = LinkedList_getNext(element)) != NULL) {
+        while ((element = LinkedList_getNext(element)) != NULL)
+        {
             MapEntry* entry = (MapEntry*) element->data;
+
             if (deleteKey == true)
                 GLOBAL_FREEMEM(entry->key);
+
             valueDeleteFunction(entry->value);
         }
 

src/sntp/sntp_client.c

@@ -169,7 +169,9 @@ parseResponseMessage(SNTPClient self, uint8_t* buffer, int bufSize)
         /* ignore time message */
         if (SNTP_DEBUG)
             printf("WARNING: received clock-not-synchronized from server\n");
-        //TODO call user callback?
+
+        /* TODO call user callback? */
+
         return;
     }
 
@@ -304,9 +306,6 @@ sendRequestMessage(SNTPClient self, const char* serverAddr, int serverPort)
 
     self->lastRequestTimestamp = nsTime;
     self->outStandingRequest = true;
-
-    //if (self->lastReceivedMessage == 0)
-    //    self->lastReceivedMessage = nsTime;
 }
 
 SNTPClient