minor fixes -> mainly replaceing NULL with UA_NULL

src/opcua_basictypes.c

@@ -687,7 +687,7 @@ UA_Int32 UA_ExtensionObject_calcSize(UA_ExtensionObject const * p) {
 			length += UA_ByteString_calcSize(&(p->body));
 			break;
 		case UA_ExtensionObject_BodyIsXml:
-			length += UA_XmlElement_calcSize(&(p->body));
+			length += UA_XmlElement_calcSize((UA_XmlElement*)&(p->body));
 			break;
 		}
 	}
@@ -869,7 +869,7 @@ UA_TYPE_METHOD_DELETEMEMBERS_NOACTION(UA_DateTime)
 UA_DateTime UA_DateTime_now() {
 	UA_DateTime dateTime;
 	struct timeval tv;
-	gettimeofday(&tv, NULL);
+	gettimeofday(&tv, UA_NULL);
 	dateTime = (tv.tv_sec + FILETIME_UNIXTIME_BIAS_SEC)
 			* HUNDRED_NANOSEC_PER_SEC + tv.tv_usec * HUNDRED_NANOSEC_PER_USEC;
 	return dateTime;

src/util/UA_indexedList.c

@@ -6,13 +6,13 @@ void UA_indexedList_defaultFreer(void* payload){
 }
 
 UA_Int32 UA_indexedList_init(UA_indexedList_List* const list){
-	if(list==NULL)return UA_ERROR;
+	if(list==UA_NULL)return UA_ERROR;
 	return UA_list_init((UA_list_List*)list);
 }
 
 UA_Int32 UA_indexedList_destroy(UA_indexedList_List* const list, UA_indexedList_PayloadVisitor visitor){
-	if(list==NULL)return UA_ERROR;
-	UA_list_Element* current = NULL;
+	if(list==UA_NULL)return UA_ERROR;
+	UA_list_Element* current = UA_NULL;
 	current=list->first;
 	while(current){
 		UA_list_Element* next = current->next;
@@ -31,15 +31,15 @@ UA_Int32 UA_indexedList_destroy(UA_indexedList_List* const list, UA_indexedList_
 }
 
 UA_Int32 UA_indexedList_initElement(UA_indexedList_Element* const elem){
-	if(elem==NULL)return UA_ERROR;
-	elem->father = NULL;
+	if(elem==UA_NULL)return UA_ERROR;
+	elem->father = UA_NULL;
 	elem->index = -1;
-	elem->payload = NULL;
+	elem->payload = UA_NULL;
 	return UA_NO_ERROR;
 }
 
 UA_Int32 UA_indexedList_addValue(UA_indexedList_List* const list, UA_Int32 index, void* payload){
-	if(list==NULL)return UA_ERROR;
+	if(list==UA_NULL)return UA_ERROR;
 	UA_list_Element* dllElem = (UA_list_Element*)malloc(sizeof(*dllElem));
 	UA_list_initElement(dllElem);
 	UA_indexedList_Element* iilElem = (UA_indexedList_Element*)malloc(sizeof(UA_indexedList_Element));
@@ -52,7 +52,7 @@ UA_Int32 UA_indexedList_addValue(UA_indexedList_List* const list, UA_Int32 index
 }
 
 UA_Int32 UA_indexedList_addValueToFront(UA_indexedList_List* const list, UA_Int32 index, void* payload){
-	if(list==NULL)return UA_ERROR;
+	if(list==UA_NULL)return UA_ERROR;
 	UA_list_Element* dllElem = (UA_list_Element*)malloc(sizeof(*dllElem));
 	UA_list_initElement(dllElem);
 	UA_indexedList_Element* iilElem = (UA_indexedList_Element*)malloc(sizeof(*iilElem));
@@ -65,7 +65,7 @@ UA_Int32 UA_indexedList_addValueToFront(UA_indexedList_List* const list, UA_Int3
 }
 
 UA_indexedList_Element* UA_indexedList_find(UA_indexedList_List* const list, UA_Int32 index){
-	if(list==NULL)return NULL;
+	if(list==UA_NULL)return UA_NULL;
 	UA_list_Element* current = list->first;
 	while(current){
 		if(current->payload){
@@ -76,20 +76,20 @@ UA_indexedList_Element* UA_indexedList_find(UA_indexedList_List* const list, UA_
 		}
 		current=current->next;
 	}
-	return NULL;
+	return UA_NULL;
 }
 
 void* UA_indexedList_findValue(UA_indexedList_List* const list, UA_Int32 index){
-	if(list==NULL)return NULL;
+	if(list==UA_NULL)return UA_NULL;
 	UA_indexedList_Element* iilElem = UA_indexedList_find(list, index);
 	if(iilElem){
 		return iilElem->payload;
 	}
-	return NULL;
+	return UA_NULL;
 }
 
 UA_Int32 UA_indexedList_iterateValues(UA_indexedList_List* const list, UA_indexedList_PayloadVisitor visitor){
-	if(list==NULL)return UA_ERROR;
+	if(list==UA_NULL)return UA_ERROR;
 	UA_list_Element* current = list->first;
 	while(current){
 		if(current->payload){
@@ -105,11 +105,11 @@ UA_Int32 UA_indexedList_iterateValues(UA_indexedList_List* const list, UA_indexe
 }
 
 UA_Int32 UA_indexedList_removeElement(UA_indexedList_List* const list, UA_indexedList_Element* elem, UA_indexedList_PayloadVisitor visitor){
-	if(list==NULL || elem==NULL)return UA_ERROR;
+	if(list==UA_NULL || elem==UA_NULL)return UA_ERROR;
 	if(visitor){
 		(*visitor)(elem->payload);
 	}
 	UA_list_Element* father = elem->father;
 	free(elem);
-	return UA_list_removeElement(father, NULL);
+	return UA_list_removeElement(father, UA_NULL);
 }

src/util/UA_list.c

@@ -8,28 +8,28 @@ void UA_list_defaultFreer(void* payload){
 }
 
 UA_Int32 UA_list_initElement(UA_list_Element* const element){
-	if(element==NULL)return UA_ERROR;
-	element->next=NULL;
-	element->prev=NULL;
-	element->father=NULL;
-	element->payload=NULL;
+	if(element==UA_NULL)return UA_ERROR;
+	element->next=UA_NULL;
+	element->prev=UA_NULL;
+	element->father=UA_NULL;
+	element->payload=UA_NULL;
 	return UA_NO_ERROR;
 }
 
 UA_Int32 UA_list_init(UA_list_List* const list){
-	if(list==NULL)return UA_ERROR;
-	list->first = NULL;
-	list->last = NULL;
+	if(list==UA_NULL)return UA_ERROR;
+	list->first = UA_NULL;
+	list->last = UA_NULL;
 	list->size = 0;
 	return UA_NO_ERROR;
 }
 
 UA_Int32 UA_list_addElementToFront(UA_list_List* const list, UA_list_Element* const element){
-	if(list==NULL || element==NULL)return UA_ERROR;
-	UA_list_Element* second = NULL;
+	if(list==UA_NULL || element==UA_NULL)return UA_ERROR;
+	UA_list_Element* second = UA_NULL;
 	second = list->first;
 	list->first = element;
-	element->prev = NULL;
+	element->prev = UA_NULL;
 	element->next = second;
 	element->father = list;
 	if(second){
@@ -43,7 +43,7 @@ UA_Int32 UA_list_addElementToFront(UA_list_List* const list, UA_list_Element* co
 }
 
 UA_Int32 UA_list_addPayloadToFront(UA_list_List* const list, void* const payload){
-	if(list==NULL)return UA_ERROR;
+	if(list==UA_NULL)return UA_ERROR;
 	UA_list_Element* elem;
 	UA_alloc((void**)&elem, sizeof(*elem));
 	UA_list_initElement(elem);
@@ -53,12 +53,12 @@ UA_Int32 UA_list_addPayloadToFront(UA_list_List* const list, void* const payload
 }
 
 UA_Int32 UA_list_addElementToBack(UA_list_List* const list, UA_list_Element* const element){
-	if(list==NULL || element == NULL)return UA_ERROR;
-	UA_list_Element* secondLast = NULL;
+	if(list==UA_NULL || element == UA_NULL)return UA_ERROR;
+	UA_list_Element* secondLast = UA_NULL;
 	secondLast = list->last;
 	list->last = element;
 	element->prev = secondLast;
-	element->next = NULL;
+	element->next = UA_NULL;
 	element->father = list;
 	if(secondLast){
 		secondLast->next = element;
@@ -71,7 +71,7 @@ UA_Int32 UA_list_addElementToBack(UA_list_List* const list, UA_list_Element* con
 }
 
 UA_Int32 UA_list_addPayloadToBack(UA_list_List* const list, void* const payload){
-	if(list==NULL)return UA_ERROR;
+	if(list==UA_NULL)return UA_ERROR;
 	UA_list_Element* elem;
 	UA_alloc((void**)&elem, sizeof(*elem));
 	UA_list_initElement(elem);
@@ -81,8 +81,8 @@ UA_Int32 UA_list_addPayloadToBack(UA_list_List* const list, void* const payload)
 }
 
 UA_Int32 UA_list_removeFirst(UA_list_List* const list, UA_list_PayloadVisitor visitor){
-	if(list==NULL)return UA_ERROR;
-	UA_list_Element* temp = NULL;
+	if(list==UA_NULL)return UA_ERROR;
+	UA_list_Element* temp = UA_NULL;
 	if(list->first){
 		temp = list->first->next;
 		if(visitor){
@@ -94,15 +94,15 @@ UA_Int32 UA_list_removeFirst(UA_list_List* const list, UA_list_PayloadVisitor vi
 		if(list->size == 1){
 			list->last = temp;
 		}else if(list->size==0){
-			list->last = NULL;
+			list->last = UA_NULL;
 		}
 	}
 	return UA_NO_ERROR;
 }
 
 UA_Int32 UA_list_removeLast(UA_list_List* const list, UA_list_PayloadVisitor visitor){
-	if(list==NULL)return UA_ERROR;
-	UA_list_Element* temp = NULL;
+	if(list==UA_NULL)return UA_ERROR;
+	UA_list_Element* temp = UA_NULL;
 	if(list->last){
 		temp = list->last->prev;
 		if(visitor){
@@ -114,7 +114,7 @@ UA_Int32 UA_list_removeLast(UA_list_List* const list, UA_list_PayloadVisitor vis
 		if(list->size == 1){
 			list->first = temp;
 		}else if(list->size==0){
-			list->first = NULL;
+			list->first = UA_NULL;
 		}
 	}
 	return UA_NO_ERROR;
@@ -122,7 +122,7 @@ UA_Int32 UA_list_removeLast(UA_list_List* const list, UA_list_PayloadVisitor vis
 
 
 UA_Int32 UA_list_removeElement(UA_list_Element* const elem, UA_list_PayloadVisitor visitor){
-	if(elem==NULL)return UA_ERROR;
+	if(elem==UA_NULL)return UA_ERROR;
 	if(elem==elem->father->first){
 		return UA_list_removeFirst(elem->father, visitor);
 	}else if(elem==elem->father->last){
@@ -142,8 +142,8 @@ UA_Int32 UA_list_removeElement(UA_list_Element* const elem, UA_list_PayloadVisit
 }
 
 UA_Int32 UA_list_destroy(UA_list_List* const list, UA_list_PayloadVisitor visitor){
-	if(list==NULL)return UA_ERROR;
-	UA_list_Element* current = NULL;
+	if(list==UA_NULL)return UA_ERROR;
+	UA_list_Element* current = UA_NULL;
 	current=list->first;
 	while(current){
 		UA_list_Element* next = current->next;
@@ -158,7 +158,7 @@ UA_Int32 UA_list_destroy(UA_list_List* const list, UA_list_PayloadVisitor visito
 }
 
 UA_Int32 UA_list_iterateElement(UA_list_List* const list, UA_list_ElementVisitor visitor){
-	if(list==NULL)return UA_ERROR;
+	if(list==UA_NULL)return UA_ERROR;
 	UA_list_Element* current = list->first;
 	while(current){
 		if(visitor){
@@ -181,7 +181,7 @@ UA_Int32 UA_list_iterateElement(UA_list_List* const list, UA_list_ElementVisitor
 }*/
 /** ANSI C forbids function nesting - reworked ugly version **/
 UA_Int32 UA_list_iteratePayload(UA_list_List* const list, UA_list_PayloadVisitor visitor){
-	if(list==NULL)return UA_ERROR;
+	if(list==UA_NULL)return UA_ERROR;
 	UA_list_Element* current = list->first;
 	while(current){
 		if(visitor){
@@ -193,7 +193,7 @@ UA_Int32 UA_list_iteratePayload(UA_list_List* const list, UA_list_PayloadVisitor
 }
 
 UA_list_Element* UA_list_find(UA_list_List* const list, UA_list_PayloadMatcher matcher){
-	if(list==NULL)return NULL;
+	if(list==UA_NULL)return UA_NULL;
 	if(matcher){
 		UA_list_Element* current = list->first;
 		while(current){
@@ -204,15 +204,15 @@ UA_list_Element* UA_list_find(UA_list_List* const list, UA_list_PayloadMatcher m
 		}
 	}
 	/* nothing found */
-	return NULL;
+	return UA_NULL;
 }
 
 UA_list_Element* UA_list_getFirst(UA_list_List* const list){
-	if(list==NULL)return NULL;
+	if(list==UA_NULL)return UA_NULL;
 	return list->first;
 }
 
 UA_list_Element* UA_list_getLast(UA_list_List* const list){
-	if(list==NULL)return NULL;
+	if(list==UA_NULL)return UA_NULL;
 	return list->last;
 }