js/CoreFW
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use (void*)NULL instead of NULL in varargs.

Browse source
This commit is contained in:
Jonathan Schleifer 2013-06-08 11:47:14 +02:00
parent 05d2e13e6d
commit 5ff33a73d8
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/array.c
View file

@ -113,7 +113,7 @@ copy(void *ptr)
CFWArray *new; CFWArray *new;
size_t i; size_t i;
if ((new = cfw_new(cfw_array, NULL)) == NULL) if ((new = cfw_new(cfw_array, (void*)NULL)) == NULL)
return NULL; return NULL;
if ((new->data = malloc(sizeof(void*) * array->size)) == NULL) { if ((new->data = malloc(sizeof(void*) * array->size)) == NULL) {

2
src/class.h
View file

@ -35,7 +35,7 @@
typedef struct CFWClass { typedef struct CFWClass {
const char *name; const char *name;
size_t size; size_t size;
bool (*ctor)(void*, va_list args); bool (*ctor)(void*, va_list);
void (*dtor)(void*); void (*dtor)(void*);
bool (*equal)(void*, void*); bool (*equal)(void*, void*);
uint32_t (*hash)(void*); uint32_t (*hash)(void*);

2
src/map.c
View file

@ -126,7 +126,7 @@ copy(void *ptr)
CFWMap *new; CFWMap *new;
uint32_t i; uint32_t i;
if ((new = cfw_new(cfw_map, NULL)) == NULL) if ((new = cfw_new(cfw_map, (void*)NULL)) == NULL)
return NULL; return NULL;
if ((new->data = malloc(sizeof(*new->data) * map->size)) == NULL) if ((new->data = malloc(sizeof(*new->data) * map->size)) == NULL)

6
src/stream.c
View file

@ -113,7 +113,7 @@ cfw_stream_read_line(void *ptr)
if (ret_str == NULL) if (ret_str == NULL)
return NULL; return NULL;
ret = cfw_create(cfw_string, NULL); ret = cfw_create(cfw_string, (void*)NULL);
if (ret == NULL) { if (ret == NULL) {
free(ret_str); free(ret_str);
return NULL; return NULL;
@ -159,7 +159,7 @@ cfw_stream_read_line(void *ptr)
if (ret_str == NULL) if (ret_str == NULL)
return NULL; return NULL;
ret = cfw_create(cfw_string, NULL); ret = cfw_create(cfw_string, (void*)NULL);
if (ret == NULL) { if (ret == NULL) {
free(ret_str); free(ret_str);
return NULL; return NULL;
@ -199,7 +199,7 @@ cfw_stream_read_line(void *ptr)
ret_len--; ret_len--;
ret_str[ret_len] = '\0'; ret_str[ret_len] = '\0';
ret = cfw_create(cfw_string, NULL); ret = cfw_create(cfw_string, (void*)NULL);
if (ret == NULL) { if (ret == NULL) {
free(buf); free(buf);
free(ret_str); free(ret_str);

2
src/string.c
View file

@ -154,7 +154,7 @@ copy(void *ptr)
CFWString *str = ptr; CFWString *str = ptr;
CFWString *new; CFWString *new;
if ((new = cfw_new(cfw_string, NULL)) == NULL) if ((new = cfw_new(cfw_string, (void*)NULL)) == NULL)
return NULL; return NULL;
if ((new->data = malloc(str->len + 1)) == NULL) { if ((new->data = malloc(str->len + 1)) == NULL) {