gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 20:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor cleanups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32234 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-02-19 19:42:42 +00:00
parent b9b50a9fef
commit 474a12b708
16 changed files with 93 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -1,3 +1,23 @@
2011-02-19 Richard Frith-Macdonald <rfm@gnu.org>
* 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 <rfm@gnu.org>
* Source/GSFFCallInvocation.m: Updated two obsolete runtime calls

2
Source/GSFFCallInvocation.m
View file

@ -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

4
Source/NSBundle.m
View file

@ -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
{

2
Source/NSCallBacks.m
View file

@ -93,7 +93,7 @@ void
_NS_owned_void_p_release(void *table, void *p)
{
if (p != 0)
objc_free(p);
free(p);
return;
}

4
Source/NSConcretePointerFunctions.m
View file

@ -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

4
Source/NSException.m
View file

@ -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");

4
Source/NSFileManager.m
View file

@ -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

4
Source/NSLog.m
View file

@ -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);

49
Source/NSProcessInfo.m
View file

@ -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;
}

4
Source/NSURLProtocol.m
View file

@ -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

38
Source/NSZone.m
View file

@ -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"];
}

6
Source/cifframe.m
View file

@ -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;
}

6
Source/objc-load.m
View file

@ -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)

8
Source/win32/NSMessagePortNameServer.m
View file

@ -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);
}
/*

4
Tests/base/NSInvocation/Resources/InvokeProxy.m
View file

@ -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
}

8
Tools/defaults.m
View file

@ -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,