@@ -20,35 +20,16 @@ + list { return [[[self alloc] init] autorelease]; } -+ listWithListObjectSize: (size_t)listobj_size_ -{ - return [[[self alloc] - initWithListObjectSize: listobj_size_] autorelease]; -} - - init { self = [super init]; first = NULL; last = NULL; - listobj_size = sizeof(of_list_object_t); - retain_and_release = YES; - - return self; -} - -- initWithListObjectSize: (size_t)listobj_size_; -{ - self = [super init]; - - first = NULL; - last = NULL; - listobj_size = listobj_size_; retain_and_release = YES; return self; } @@ -56,11 +37,10 @@ { self = [super init]; first = NULL; last = NULL; - listobj_size = sizeof(of_list_object_t); return self; } - (void)dealloc @@ -85,11 +65,11 @@ - (of_list_object_t*)append: (id)obj { of_list_object_t *o; - o = [self allocMemoryWithSize: listobj_size]; + o = [self allocMemoryWithSize: sizeof(of_list_object_t)]; o->object = obj; o->next = NULL; o->prev = last; if (last != NULL) @@ -109,11 +89,11 @@ - (of_list_object_t*)prepend: (id)obj { of_list_object_t *o; - o = [self allocMemoryWithSize: listobj_size]; + o = [self allocMemoryWithSize: sizeof(of_list_object_t)]; o->object = obj; o->next = first; o->prev = NULL; if (first != NULL) @@ -134,11 +114,11 @@ - (of_list_object_t*)insert: (id)obj before: (of_list_object_t*)listobj { of_list_object_t *o; - o = [self allocMemoryWithSize: listobj_size]; + o = [self allocMemoryWithSize: sizeof(of_list_object_t)]; o->object = obj; o->next = listobj; o->prev = listobj->prev; if (listobj->prev != NULL) @@ -160,11 +140,11 @@ - (of_list_object_t*)insert: (id)obj after: (of_list_object_t*)listobj { of_list_object_t *o; - o = [self allocMemoryWithSize: listobj_size]; + o = [self allocMemoryWithSize: sizeof(of_list_object_t)]; o->object = obj; o->next = listobj->next; o->prev = listobj; if (listobj->next != NULL) @@ -244,11 +224,11 @@ o = NULL; prev = NULL; @try { for (iter = first; iter != NULL; iter = iter->next) { - o = [new allocMemoryWithSize: listobj_size]; + o = [new allocMemoryWithSize: sizeof(of_list_object_t)]; o->object = iter->object; o->next = NULL; o->prev = prev; if (new->first == NULL)