From 5ff33a73d83d49380d81a6f962d5b09e37e7b559 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Sat, 8 Jun 2013 11:47:14 +0200
Subject: [PATCH] Use (void*)NULL instead of NULL in varargs.

---
 src/array.c  | 2 +-
 src/class.h  | 2 +-
 src/map.c    | 2 +-
 src/stream.c | 6 +++---
 src/string.c | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/array.c b/src/array.c
index d027d5d..5704d33 100644
--- a/src/array.c
+++ b/src/array.c
@@ -113,7 +113,7 @@ copy(void *ptr)
 	CFWArray *new;
 	size_t i;
 
-	if ((new = cfw_new(cfw_array, NULL)) == NULL)
+	if ((new = cfw_new(cfw_array, (void*)NULL)) == NULL)
 		return NULL;
 
 	if ((new->data = malloc(sizeof(void*) * array->size)) == NULL) {
diff --git a/src/class.h b/src/class.h
index f00d066..4de3dcb 100644
--- a/src/class.h
+++ b/src/class.h
@@ -35,7 +35,7 @@
 typedef struct CFWClass {
 	const char *name;
 	size_t size;
-	bool (*ctor)(void*, va_list args);
+	bool (*ctor)(void*, va_list);
 	void (*dtor)(void*);
 	bool (*equal)(void*, void*);
 	uint32_t (*hash)(void*);
diff --git a/src/map.c b/src/map.c
index 5ded579..a33d943 100644
--- a/src/map.c
+++ b/src/map.c
@@ -126,7 +126,7 @@ copy(void *ptr)
 	CFWMap *new;
 	uint32_t i;
 
-	if ((new = cfw_new(cfw_map, NULL)) == NULL)
+	if ((new = cfw_new(cfw_map, (void*)NULL)) == NULL)
 		return NULL;
 
 	if ((new->data = malloc(sizeof(*new->data) * map->size)) == NULL)
diff --git a/src/stream.c b/src/stream.c
index 5bc2318..77f3c53 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -113,7 +113,7 @@ cfw_stream_read_line(void *ptr)
 				if (ret_str == NULL)
 					return NULL;
 
-				ret = cfw_create(cfw_string, NULL);
+				ret = cfw_create(cfw_string, (void*)NULL);
 				if (ret == NULL) {
 					free(ret_str);
 					return NULL;
@@ -159,7 +159,7 @@ cfw_stream_read_line(void *ptr)
 			if (ret_str == NULL)
 				return NULL;
 
-			ret = cfw_create(cfw_string, NULL);
+			ret = cfw_create(cfw_string, (void*)NULL);
 			if (ret == NULL) {
 				free(ret_str);
 				return NULL;
@@ -199,7 +199,7 @@ cfw_stream_read_line(void *ptr)
 					ret_len--;
 				ret_str[ret_len] = '\0';
 
-				ret = cfw_create(cfw_string, NULL);
+				ret = cfw_create(cfw_string, (void*)NULL);
 				if (ret == NULL) {
 					free(buf);
 					free(ret_str);
diff --git a/src/string.c b/src/string.c
index 9fdab5e..333b501 100644
--- a/src/string.c
+++ b/src/string.c
@@ -154,7 +154,7 @@ copy(void *ptr)
 	CFWString *str = ptr;
 	CFWString *new;
 
-	if ((new = cfw_new(cfw_string, NULL)) == NULL)
+	if ((new = cfw_new(cfw_string, (void*)NULL)) == NULL)
 		return NULL;
 
 	if ((new->data = malloc(str->len + 1)) == NULL) {