DeforaOS/libSystem
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using the Object class

Browse Source
This commit is contained in:
Pierre Pronchery 2008-02-25 00:59:12 +00:00
parent e924e0c41b
commit 3d46e70771
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/array.c
View File

@ -26,7 +26,7 @@ Array * array_new(size_t size)
{
Array * array;
if((array = malloc(sizeof(Array))) == NULL)
if((array = object_new(sizeof(*array))) == NULL)
return NULL;
array->data = NULL;
array->count = 0;
@ -37,7 +37,7 @@ Array * array_new(size_t size)
void array_delete(Array * array)
{
free(array);
object_delete(array);
}

10
src/buffer.c
View File

@ -41,14 +41,12 @@ Buffer * buffer_new(size_t size, char const * data)
{
Buffer * buffer;
if((buffer = malloc(sizeof(Buffer))) == NULL)
{
error_set_code(1, "%s", strerror(errno));
if((buffer = object_new(sizeof(*buffer))) == NULL)
return NULL;
}
if((buffer->data = malloc(size * sizeof(char))) == NULL)
{
free(buffer);
error_set_code(1, "%s", strerror(errno));
object_delete(buffer);
return NULL;
}
if(data == NULL)
@ -64,7 +62,7 @@ Buffer * buffer_new(size_t size, char const * data)
void buffer_delete(Buffer * buffer)
{
free(buffer->data);
free(buffer);
object_delete(buffer);
}

6
src/event.c
View File

@ -71,11 +71,11 @@ Event * event_new(void)
{
Event * event;
if((event = malloc(sizeof(Event))) == NULL)
if((event = object_new(sizeof(*event))) == NULL)
return NULL;
if((event->timeouts = eventtimeoutarray_new()) == NULL)
{
free(event);
object_delete(event);
return NULL;
}
event->fdmax = -1;
@ -114,7 +114,7 @@ void event_delete(Event * event)
free(eio);
}
array_delete(event->writes);
free(event);
object_delete(event);
}