From aa738fa37963782245ade37d07c79a970fb4f40a Mon Sep 17 00:00:00 2001 From: ratmice Date: Tue, 5 Dec 2006 15:02:26 +0000 Subject: [PATCH] * Source/NSBundle.m (+initialize): Remove usage of classes local array. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24188 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 4 ++++ Source/NSBundle.m | 29 +++-------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c47c6a86..78c719ab7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-12-05 Matt Rice + + * Source/NSBundle.m (+initialize): Remove usage of classes local array. + 2006-12-05 Richard Frith-Macdonald * NSURL.m: Check for missing scheme and return nil. diff --git a/Source/NSBundle.m b/Source/NSBundle.m index 1ca86e300..2f5d389b6 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -777,39 +777,16 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) } #else { - int i, numBufClasses = 10, numClasses = 0; - Class *classes; - - classes = objc_malloc(sizeof(Class) * numBufClasses); - while ((class = objc_next_class(&state))) { unsigned int len = strlen (class->name); - if (len > 12 * sizeof(char) - && !strncmp("NSFramework_", class->name, 12)) + if (len > sizeof("NSFramework_") + && !strncmp("NSFramework_", class->name, 12)) { - classes[numClasses++] = class; - } - if (numClasses == numBufClasses) - { - Class *ptr; - - numBufClasses += 10; - ptr = objc_realloc(classes, sizeof(Class) * numBufClasses); - - if (!ptr) - break; - - classes = ptr; + [self _addFrameworkFromClass: class]; } } - - for (i = 0; i < numClasses; i++) - { - [self _addFrameworkFromClass: classes[i]]; - } - objc_free(classes); } #endif #if 0