From ca854a4b3cc1654ca74e6996d948c5b1c527b2e5 Mon Sep 17 00:00:00 2001 From: rfm Date: Sat, 19 Feb 2011 19:42:42 +0000 Subject: [PATCH] minor cleanups git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32234 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 20 ++++++++ Source/GSFFCallInvocation.m | 2 +- Source/NSBundle.m | 4 +- Source/NSCallBacks.m | 2 +- Source/NSConcretePointerFunctions.m | 4 +- Source/NSException.m | 4 +- Source/NSFileManager.m | 4 +- Source/NSLog.m | 4 +- Source/NSProcessInfo.m | 49 +++++++++---------- Source/NSURLProtocol.m | 4 +- Source/NSZone.m | 38 +++++++------- Source/cifframe.m | 6 +-- Source/objc-load.m | 6 +-- Source/win32/NSMessagePortNameServer.m | 8 +-- .../base/NSInvocation/Resources/InvokeProxy.m | 4 +- Tools/defaults.m | 8 +-- 16 files changed, 93 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index d709445f5..d93ef671e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2011-02-19 Richard Frith-Macdonald + + * Source/NSBundle.m: + * Source/NSProcessInfo.m: + * Source/NSConcretePointerFunctions.m: + * Source/GSFFCallInvocation.m: + * Source/NSZone.m: + * Source/NSCallBacks.m: + * Source/win32/NSMessagePortNameServer.m: + * Source/NSFileManager.m: + * Source/NSURLProtocol.m: + * Source/objc-load.m: + * Source/NSException.m: + * Source/cifframe.m: + * Source/NSLog.m: + * Tools/defaults.m: + * Tests/base/NSInvocation/Resources/InvokeProxy.m: + Remove obsolete calls to objc_malloc() in favour of NSZoneMalloc() or + malloc() where using zones is not appropriate. + 2011-02-19 Richard Frith-Macdonald * Source/GSFFCallInvocation.m: Updated two obsolete runtime calls diff --git a/Source/GSFFCallInvocation.m b/Source/GSFFCallInvocation.m index 1d28d49af..d5b1f3f21 100644 --- a/Source/GSFFCallInvocation.m +++ b/Source/GSFFCallInvocation.m @@ -493,7 +493,7 @@ static IMP gs_objc_msg_forward (SEL sel) // 2.b.2 NO, we do not have it. vacallReturnTypeInfo *ret_info; - ret_info = objc_malloc (sizeof (vacallReturnTypeInfo)); + ret_info = malloc(sizeof (vacallReturnTypeInfo)); *ret_info = returnInfo; forwarding_callback diff --git a/Source/NSBundle.m b/Source/NSBundle.m index dea1b96d1..a83307a6a 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -885,14 +885,14 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) while (numClasses < newNumClasses) { numClasses = newNumClasses; - classes = objc_realloc(classes, sizeof(Class) * numClasses); + classes = realloc(classes, sizeof(Class) * numClasses); newNumClasses = objc_getClassList(classes, numClasses); } for (i = 0; i < numClasses; i++) { [self _addFrameworkFromClass: classes[i]]; } - objc_free(classes); + free(classes); } #else { diff --git a/Source/NSCallBacks.m b/Source/NSCallBacks.m index 2dfe13c52..c9e8b6f87 100644 --- a/Source/NSCallBacks.m +++ b/Source/NSCallBacks.m @@ -93,7 +93,7 @@ void _NS_owned_void_p_release(void *table, void *p) { if (p != 0) - objc_free(p); + free(p); return; } diff --git a/Source/NSConcretePointerFunctions.m b/Source/NSConcretePointerFunctions.m index c125ce7ed..426d45e5c 100644 --- a/Source/NSConcretePointerFunctions.m +++ b/Source/NSConcretePointerFunctions.m @@ -33,7 +33,7 @@ acquireMallocMemory(const void *item, if (shouldCopy == YES) { NSUInteger len = (*size)(item); - void *newItem = objc_malloc(len); + void *newItem = malloc(len); memcpy(newItem, item, len); item = newItem; @@ -161,7 +161,7 @@ static void relinquishMallocMemory(const void *item, NSUInteger (*size)(const void *item)) { - objc_free((void*)item); + free((void*)item); } static void diff --git a/Source/NSException.m b/Source/NSException.m index ee1f63292..c2b29b155 100644 --- a/Source/NSException.m +++ b/Source/NSException.m @@ -293,7 +293,7 @@ GSPrivateBaseAddress(void *addr, void **base) } if (_symbols) { - objc_free (_symbols); + free(_symbols); _symbols = NULL; } [super dealloc]; @@ -359,7 +359,7 @@ GSPrivateBaseAddress(void *addr, void **base) DESTROY(self); return nil; } - _symbols = objc_malloc (neededSpace); + _symbols = malloc (neededSpace); if (!_symbols) { //NSLog (@"GSBinaryFileInfo: Can't allocate buffer"); diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m index ec42a5ef9..f7f2ae1e0 100644 --- a/Source/NSFileManager.m +++ b/Source/NSFileManager.m @@ -993,7 +993,7 @@ static NSStringEncoding defaultEncoding; int len = GetCurrentDirectoryW(0, 0); if (len > 0) { - _CHAR *lpath = (_CHAR*)objc_calloc(len+10,sizeof(_CHAR)); + _CHAR *lpath = (_CHAR*)calloc(len+10,sizeof(_CHAR)); if (lpath != 0) { @@ -1006,7 +1006,7 @@ static NSStringEncoding defaultEncoding; path = [NSString stringWithCharacters: lpath length: len]; currentDir = path; } - objc_free(lpath); + free(lpath); } } #else diff --git a/Source/NSLog.m b/Source/NSLog.m index a415666be..d57e790e8 100644 --- a/Source/NSLog.m +++ b/Source/NSLog.m @@ -173,13 +173,13 @@ _NSLog_standard_printf_handler (NSString* message) if (GSPrivateDefaultsFlag(GSLogSyslog) == YES || write(_NSLogDescriptor, buf, len) != (int)len) { - null_terminated_buf = objc_malloc (sizeof (char) * (len + 1)); + null_terminated_buf = malloc(sizeof (char) * (len + 1)); strncpy (null_terminated_buf, buf, len); null_terminated_buf[len] = '\0'; syslog(SYSLOGMASK, "%s", null_terminated_buf); - objc_free (null_terminated_buf); + free(null_terminated_buf); } #else write(_NSLogDescriptor, buf, len); diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m index a787dfb66..f39b4a34b 100644 --- a/Source/NSProcessInfo.m +++ b/Source/NSProcessInfo.m @@ -231,12 +231,12 @@ _gnu_process_args(int argc, char *argv[], char *env[]) if (_gnu_arg_zero != 0) { - objc_free(_gnu_arg_zero); + free(_gnu_arg_zero); } if (argv != 0 && argv[0] != 0) { - _gnu_arg_zero = (char*)objc_malloc(strlen(argv[0]) + 1); + _gnu_arg_zero = (char*)malloc(strlen(argv[0]) + 1); strcpy(_gnu_arg_zero, argv[0]); arg0 = [[NSString alloc] initWithCString: _gnu_arg_zero]; } @@ -251,7 +251,7 @@ _gnu_process_args(int argc, char *argv[], char *env[]) while (needed_size == buffer_size) { buffer_size = buffer_size + 256; - buffer = (unichar*)objc_malloc(buffer_size * sizeof(unichar)); + buffer = (unichar*)malloc(buffer_size * sizeof(unichar)); needed_size = GetModuleFileNameW(NULL, buffer, buffer_size); if (needed_size < buffer_size) { @@ -268,11 +268,11 @@ _gnu_process_args(int argc, char *argv[], char *env[]) } else { - objc_free(buffer); + free(buffer); } } tmp = [arg0 cStringUsingEncoding: [NSString defaultCStringEncoding]]; - _gnu_arg_zero = (char*)objc_malloc(strlen(tmp) + 1); + _gnu_arg_zero = (char*)malloc(strlen(tmp) + 1); strcpy(_gnu_arg_zero, tmp); #else fprintf(stderr, "Error: for some reason, argv not properly set up " @@ -511,7 +511,7 @@ static char **_gnu_noobjc_env = NULL; /* copy the environment strings */ for (count = 0; vectors[count]; count++) ; - _gnu_noobjc_env = (char**)objc_malloc(sizeof(char*) * (count + 1)); + _gnu_noobjc_env = (char**)malloc(sizeof(char*) * (count + 1)); if (!_gnu_noobjc_env) goto malloc_error; for (i = 0; i < count; i++) @@ -539,7 +539,7 @@ static char **_gnu_noobjc_env = NULL; for (_gnu_noobjc_argc = 0; vectors[_gnu_noobjc_argc]; _gnu_noobjc_argc++) ; _gnu_noobjc_argv - = (char**)objc_malloc(sizeof(char*) * (_gnu_noobjc_argc + 1)); + = (char**)malloc(sizeof(char*) * (_gnu_noobjc_argc + 1)); if (!_gnu_noobjc_argv) goto malloc_error; for (i = 0; i < _gnu_noobjc_argc; i++) @@ -559,7 +559,7 @@ static char **_gnu_noobjc_env = NULL; int i, count; // Read commandline - proc_file_name = (char*)objc_malloc(sizeof(char) * 2048); + proc_file_name = (char*)malloc(sizeof(char) * 2048); sprintf(proc_file_name, "/proc/%d/psinfo", (int)getpid()); ifp = fopen(proc_file_name, "r"); @@ -585,7 +585,7 @@ static char **_gnu_noobjc_env = NULL; /* copy the environment strings */ for (count = 0; vectors[count]; count++) ; - _gnu_noobjc_env = (char**)objc_malloc(sizeof(char*) * (count + 1)); + _gnu_noobjc_env = (char**)malloc(sizeof(char*) * (count + 1)); if (!_gnu_noobjc_env) goto malloc_error; for (i = 0; i < count; i++) @@ -607,7 +607,7 @@ static char **_gnu_noobjc_env = NULL; for (_gnu_noobjc_argc = 0; vectors[_gnu_noobjc_argc]; _gnu_noobjc_argc++) ; _gnu_noobjc_argv - = (char**)objc_malloc(sizeof(char*) * (_gnu_noobjc_argc + 1)); + = (char**)malloc(sizeof(char*) * (_gnu_noobjc_argc + 1)); if (!_gnu_noobjc_argv) goto malloc_error; for (i = 0; i < _gnu_noobjc_argc; i++) @@ -656,7 +656,7 @@ static char **_gnu_noobjc_env = NULL; while (environ[c] != NULL) c++; env_terms = c; - _gnu_noobjc_env = (char**)objc_malloc(sizeof(char*) * (env_terms + 1)); + _gnu_noobjc_env = (char**)malloc(sizeof(char*) * (env_terms + 1)); if (_gnu_noobjc_env == NULL) goto malloc_error; for (c = 0; c < env_terms; c++) @@ -668,7 +668,7 @@ static char **_gnu_noobjc_env = NULL; _gnu_noobjc_env[c] = NULL; // Read commandline - proc_file_name = (char *)objc_malloc(sizeof(char) * 2048); + proc_file_name = (char *)malloc(sizeof(char) * 2048); sprintf(proc_file_name, "/proc/%d/cmdline", (int)getpid()); /* @@ -701,8 +701,7 @@ static char **_gnu_noobjc_env = NULL; * Now _gnu_noobcj_argc is the number of arguments; * allocate memory accordingly. */ - _gnu_noobjc_argv - = (char **)objc_malloc((sizeof(char *)) * (_gnu_noobjc_argc + 1)); + _gnu_noobjc_argv = (char **)malloc((sizeof(char *)) * (_gnu_noobjc_argc + 1)); if (_gnu_noobjc_argv == NULL) goto malloc_error; @@ -711,7 +710,7 @@ static char **_gnu_noobjc_env = NULL; //freopen(proc_file_name, "r", ifp); if (ifp == NULL) { - objc_free(_gnu_noobjc_argv); + free(_gnu_noobjc_argv); goto proc_fs_error; } argument = 0; @@ -723,7 +722,7 @@ static char **_gnu_noobjc_env = NULL; if ((c == EOF) || (c == 0)) // End of a parameter { _gnu_noobjc_argv[argument] - = (char*)objc_malloc((sizeof(char))*length); + = (char*)malloc((sizeof(char))*length); if (_gnu_noobjc_argv[argument] == NULL) goto malloc_error; argument++; @@ -738,8 +737,8 @@ static char **_gnu_noobjc_env = NULL; if (ifp == NULL) { for (c = 0; c < _gnu_noobjc_argc; c++) - objc_free(_gnu_noobjc_argv[c]); - objc_free(_gnu_noobjc_argv); + free(_gnu_noobjc_argv[c]); + free(_gnu_noobjc_argv); goto proc_fs_error; } argument = 0; @@ -771,7 +770,7 @@ static char **_gnu_noobjc_env = NULL; } _gnu_noobjc_argv[argument] = NULL; fclose(ifp); - objc_free(proc_file_name); + free(proc_file_name); return; proc_fs_error: @@ -791,7 +790,7 @@ static char **_gnu_noobjc_env = NULL; #ifdef HAVE_PROGRAM_INVOCATION_NAME fprintf(stderr, "We try to go on anyway; but the program will ignore any argument which were passed to it.\n"); _gnu_noobjc_argc = 1; - _gnu_noobjc_argv = objc_malloc(sizeof(char *) * 2); + _gnu_noobjc_argv = malloc(sizeof(char *) * 2); if (_gnu_noobjc_argv == NULL) goto malloc_error; _gnu_noobjc_argv[0] = strdup(program_invocation_name); @@ -809,7 +808,7 @@ static char **_gnu_noobjc_env = NULL; #endif /* HAVE_PROGRAM_INVOCATION_NAME */ #endif /* !HAVE_KVM_ENV (e.g. HAVE_PROCFS) */ malloc_error: - fprintf(stderr, "objc_malloc() error when starting gnustep-base.\n"); + fprintf(stderr, "malloc() error when starting gnustep-base.\n"); fprintf(stderr, "Free some memory and then re-run the program.\n"); abort(); } @@ -822,19 +821,19 @@ _gnu_noobjc_free_vars(void) p = _gnu_noobjc_argv; while (*p) { - objc_free(*p); + free(*p); p++; } - objc_free(_gnu_noobjc_argv); + free(_gnu_noobjc_argv); _gnu_noobjc_argv = 0; p = _gnu_noobjc_env; while (*p) { - objc_free(*p); + free(*p); p++; } - objc_free(_gnu_noobjc_env); + free(_gnu_noobjc_env); _gnu_noobjc_env = 0; } diff --git a/Source/NSURLProtocol.m b/Source/NSURLProtocol.m index 0247954ac..556d19606 100644 --- a/Source/NSURLProtocol.m +++ b/Source/NSURLProtocol.m @@ -53,12 +53,12 @@ static void* zalloc(void *opaque, unsigned nitems, unsigned size) { - return objc_calloc(nitems, size); + return calloc(nitems, size); } static void zfree(void *opaque, void *mem) { - objc_free(mem); + free(mem); } #else # undef USE_ZLIB diff --git a/Source/NSZone.m b/Source/NSZone.m index e3958089b..a680896c3 100644 --- a/Source/NSZone.m +++ b/Source/NSZone.m @@ -36,7 +36,7 @@ /* Actual design: - - The default zone uses objc_malloc() and friends. We assume that + - The default zone uses malloc() and friends. We assume that they're thread safe and that they return NULL if we're out of memory (glibc malloc does this, what about other mallocs? FIXME). @@ -121,7 +121,7 @@ default_malloc (NSZone *zone, size_t size) { void *mem; - mem = objc_malloc(size); + mem = malloc(size); if (mem == NULL) [NSException raise: NSMallocException format: @"Default zone has run out of memory"]; @@ -135,18 +135,18 @@ default_realloc (NSZone *zone, void *ptr, size_t size) if (size == 0) { - objc_free(ptr); + free(ptr); return NULL; } if (ptr == 0) { - mem = objc_malloc(size); + mem = malloc(size); if (mem == NULL) [NSException raise: NSMallocException format: @"Default zone has run out of memory"]; return mem; } - mem = objc_realloc(ptr, size); + mem = realloc(ptr, size); if (mem == NULL) [NSException raise: NSMallocException format: @"Default zone has run out of memory"]; @@ -156,7 +156,7 @@ default_realloc (NSZone *zone, void *ptr, size_t size) static void default_free (NSZone *zone, void *ptr) { - objc_free(ptr); + free(ptr); } static void @@ -170,7 +170,7 @@ default_recycle (NSZone *zone) static BOOL default_check (NSZone *zone) { - /* We can't check memory managed by objc_malloc(). */ + /* We can't check memory managed by malloc(). */ [NSException raise: NSGenericException format: @"No checking for default zone"]; return NO; @@ -188,7 +188,7 @@ default_stats (NSZone *zone) { struct NSZoneStats dummy = {0,0,0,0,0}; - /* We can't obtain statistics from the memory managed by objc_malloc(). */ + /* We can't obtain statistics from the memory managed by malloc(). */ [NSException raise: NSGenericException format: @"No statistics for default zone"]; return dummy; @@ -765,7 +765,7 @@ destroy_zone(NSZone* zone) if (ptr) ptr->next = zone->next; } - objc_free((void*)zone); + free((void*)zone); } /* Search the buffer to see if there is any memory chunks large enough @@ -989,7 +989,7 @@ frecycle1(NSZone *zone) tmp = tmp->next; tmp->next = block->next; } - objc_free((void*)block); + free((void*)block); } block = nextblock; } @@ -1277,7 +1277,7 @@ get_chunk (ffree_zone *zone, size_t size) ff_block *block; blocksize = roundupto(size, zone->common.gran); - block = objc_malloc(blocksize+2*FBSZ); + block = malloc(blocksize+2*FBSZ); if (block == NULL) return NULL; @@ -1569,7 +1569,7 @@ nmalloc (NSZone *zone, size_t size) { size_t blocksize = roundupto(chunksize+NF_HEAD, zone->gran); - block = objc_malloc(blocksize); + block = malloc(blocksize); if (block == NULL) { pthread_mutex_unlock(&(zptr->lock)); @@ -1610,7 +1610,7 @@ nrecycle1 (NSZone *zone) while (block != NULL) { nextblock = block->next; - objc_free(block); + free(block); block = nextblock; } zptr->blocks = 0; @@ -1864,7 +1864,7 @@ NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree) ff_block *chunk; ff_block *tailer; - zone = objc_malloc(sizeof(ffree_zone)); + zone = malloc(sizeof(ffree_zone)); if (zone == NULL) [NSException raise: NSMallocException format: @"No memory to create zone"]; @@ -1884,11 +1884,11 @@ NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree) zone->segtaillist[i] = NULL; } zone->bufsize = 0; - zone->blocks = objc_malloc(startsize + 2*FBSZ); + zone->blocks = malloc(startsize + 2*FBSZ); if (zone->blocks == NULL) { pthread_mutex_destroy(&(zone->lock)); - objc_free(zone); + free(zone); [NSException raise: NSMallocException format: @"No memory to create zone"]; } @@ -1919,7 +1919,7 @@ NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree) nf_block *block; nfree_zone *zone; - zone = objc_malloc(sizeof(nfree_zone)); + zone = malloc(sizeof(nfree_zone)); if (zone == NULL) [NSException raise: NSMallocException format: @"No memory to create zone"]; @@ -1933,12 +1933,12 @@ NSCreateZone (NSUInteger start, NSUInteger gran, BOOL canFree) zone->common.gran = granularity; zone->common.name = nil; GS_INIT_RECURSIVE_MUTEX(zone->lock); - zone->blocks = objc_malloc(startsize); + zone->blocks = malloc(startsize); zone->use = 0; if (zone->blocks == NULL) { pthread_mutex_destroy(&(zone->lock)); - objc_free(zone); + free(zone); [NSException raise: NSMallocException format: @"No memory to create zone"]; } diff --git a/Source/cifframe.m b/Source/cifframe.m index 9ab4981f5..ab468c7bf 100644 --- a/Source/cifframe.m +++ b/Source/cifframe.m @@ -438,7 +438,7 @@ cifframe_type(const char *typePtr, const char **advance) { size += (align - (size % align)); } - ftype = objc_malloc(size + (maxtypes+1)*sizeof(ffi_type)); + ftype = malloc(size + (maxtypes+1)*sizeof(ffi_type)); ftype->size = 0; ftype->alignment = 0; ftype->type = FFI_TYPE_STRUCT; @@ -455,7 +455,7 @@ cifframe_type(const char *typePtr, const char **advance) if (types >= maxtypes) { maxtypes *=2; - ftype = objc_realloc(ftype, + ftype = realloc(ftype, size + (maxtypes+1)*sizeof(ffi_type)); ftype->elements = (void*)ftype + size; } @@ -491,7 +491,7 @@ cifframe_type(const char *typePtr, const char **advance) if (align > max_align) { if (ftype && ftype->type == FFI_TYPE_STRUCT) - objc_free(ftype); + free(ftype); ftype = local; max_align = align; } diff --git a/Source/objc-load.m b/Source/objc-load.m index 92bf6657a..99de92e74 100644 --- a/Source/objc-load.m +++ b/Source/objc-load.m @@ -282,7 +282,7 @@ GSPrivateSymbolPath(Class theClass, Category *theCategory) { if (len + sizeof(char)*19 > sizeof(buf)) { - p = objc_malloc(len + sizeof(char)*19); + p = malloc(len + sizeof(char)*19); if (p == NULL) { @@ -300,7 +300,7 @@ GSPrivateSymbolPath(Class theClass, Category *theCategory) if (len + sizeof(char)*23 > sizeof(buf)) { - p = objc_malloc(len + sizeof(char)*23); + p = malloc(len + sizeof(char)*23); if (p == NULL) { @@ -321,7 +321,7 @@ GSPrivateSymbolPath(Class theClass, Category *theCategory) if (p != buf) { - objc_free(p); + free(p); } if (ret) diff --git a/Source/win32/NSMessagePortNameServer.m b/Source/win32/NSMessagePortNameServer.m index 08e5b3523..3ed6d29df 100644 --- a/Source/win32/NSMessagePortNameServer.m +++ b/Source/win32/NSMessagePortNameServer.m @@ -207,10 +207,10 @@ OutputDebugStringW(L""); { if (ptr != buf) { - objc_free(ptr); + free(ptr); } max += 1024; - ptr = objc_malloc(max); + ptr = malloc(max); len = max; rc = RegQueryValueExW( key, @@ -224,7 +224,7 @@ OutputDebugStringW(L""); { if (ptr != buf) { - objc_free(ptr); + free(ptr); } return nil; } @@ -232,7 +232,7 @@ OutputDebugStringW(L""); mailslotName = [NSString stringWithUTF8String: (const char *) ptr]; if (ptr != buf) { - objc_free(ptr); + free(ptr); } /* diff --git a/Tests/base/NSInvocation/Resources/InvokeProxy.m b/Tests/base/NSInvocation/Resources/InvokeProxy.m index 36f09e117..f19a1de35 100644 --- a/Tests/base/NSInvocation/Resources/InvokeProxy.m +++ b/Tests/base/NSInvocation/Resources/InvokeProxy.m @@ -153,10 +153,10 @@ d = [NSArchiver archivedDataWithRootObject: i]; i = [NSUnarchiver unarchiveObjectWithData: d]; l = [[i methodSignature] methodReturnLength]; - b = (void *)objc_malloc(l); + b = (void *)malloc(l); [i getReturnValue: b]; [inv setReturnValue: b]; - objc_free(b); + free(b); #endif } diff --git a/Tools/defaults.m b/Tools/defaults.m index 136afe313..d2de1f562 100644 --- a/Tools/defaults.m +++ b/Tools/defaults.m @@ -481,7 +481,7 @@ main(int argc, char** argv, char **env) int size = BUFSIZ; int got; int off = 0; - char *buf = objc_malloc(size); + char *buf = malloc(size); char *ptr; /* @@ -492,7 +492,7 @@ main(int argc, char** argv, char **env) { off += BUFSIZ; size += BUFSIZ; - buf = objc_realloc(buf, size); + buf = realloc(buf, size); if (buf == 0) { GSPrintf(stderr, @@ -667,14 +667,14 @@ main(int argc, char** argv, char **env) int size = BUFSIZ; int got; int off = 0; - char *buf = objc_malloc(size); + char *buf = malloc(size); char *ptr; while ((got = fread(buf + off, 1, BUFSIZ, stdin)) == BUFSIZ) { off += BUFSIZ; size += BUFSIZ; - buf = objc_realloc(buf, size); + buf = realloc(buf, size); if (buf == 0) { GSPrintf(stderr,