From: Richard Kenner Date: Sun, 22 Sep 1996 14:36:59 +0000 (-0400) Subject: Replace use of __obj_xmalloc and free with objc_malloc and objc_free. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a1feef752b96d908ffab8353d748a024809df732;p=gcc.git Replace use of __obj_xmalloc and free with objc_malloc and objc_free. From-SVN: r12765 --- diff --git a/gcc/objc/objc-list.h b/gcc/objc/objc-list.h index fb06fc6d40d..19760906238 100644 --- a/gcc/objc/objc-list.h +++ b/gcc/objc/objc-list.h @@ -1,7 +1,6 @@ /* Generic single linked list to keep various information Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc. - -Author: Kresten Krab Thorup + Contributed by Kresten Krab Thorup. This file is part of GNU CC. @@ -28,8 +27,6 @@ Boston, MA 02111-1307, USA. */ #ifndef __GNU_OBJC_LIST_H #define __GNU_OBJC_LIST_H -void * __objc_xrealloc (void *optr, size_t size); -void * __objc_xmalloc (size_t size); struct objc_list { void *head; @@ -43,7 +40,7 @@ list_cons(void* head, struct objc_list* tail) { struct objc_list* cell; - cell = (struct objc_list*)__objc_xmalloc(sizeof(struct objc_list)); + cell = (struct objc_list*)objc_malloc(sizeof(struct objc_list)); cell->head = head; cell->tail = tail; return cell; @@ -88,11 +85,11 @@ list_remove_head(struct objc_list** list) { struct objc_list* tail = (*list)->tail; /* fetch next */ *(*list) = *tail; /* copy next to list head */ - free(tail); /* free next */ + objc_free(tail); /* free next */ } else /* only one element in list */ { - free (*list); + objc_free(*list); (*list) = 0; } } @@ -144,7 +141,7 @@ list_free(struct objc_list* list) if(list) { list_free(list->tail); - free(list); + objc_free(list); } } #endif __GNU_OBJC_LIST_H diff --git a/gcc/objc/objects.c b/gcc/objc/objects.c index ba009ad7a5f..3e68334c924 100644 --- a/gcc/objc/objects.c +++ b/gcc/objc/objects.c @@ -66,19 +66,19 @@ object_dispose(id object) if (_objc_object_dispose) (*_objc_object_dispose)(object); else - free(object); + objc_free(object); } return nil; } id __objc_object_alloc(Class class) { - return (id)__objc_xmalloc(class->instance_size); + return (id)objc_malloc(class->instance_size); } id __objc_object_dispose(id object) { - free(object); + objc_free(object); return 0; }