From 701d16f5dc2f4f150f3161f0fd314513b85fd075 Mon Sep 17 00:00:00 2001 From: Sebastian Reitenbach Date: Sat, 8 Mar 2014 17:09:49 +0000 Subject: [PATCH] Double initialization is not useful, get rid of one git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@37733 72102866-910b-0410-8b05-ffd578937521 --- Apps/EOModelEditor/CodeGenerator.m | 2 +- ChangeLog | 4 ++++ EOControl/EOClassDescription.m | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Apps/EOModelEditor/CodeGenerator.m b/Apps/EOModelEditor/CodeGenerator.m index 4cbe733..98d621e 100644 --- a/Apps/EOModelEditor/CodeGenerator.m +++ b/Apps/EOModelEditor/CodeGenerator.m @@ -470,7 +470,7 @@ void addToUsedClasses(NSMutableArray * mutArray,NSSet * knownNames, NSArray * ot EOAttribute * eoAttr = nil; EORelationship * eoRel = nil; - NSEnumerator * enumer = [classScalarAttributes objectEnumerator]; + NSEnumerator * enumer; enumer = [classScalarAttributes objectEnumerator]; diff --git a/ChangeLog b/ChangeLog index 5d8ba35..4ec97fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-08 Sebastian Reitenbach + * Apps/EOModelEditor/CodeGenerator.m + * EOControl/EOClassDescription.m + 2012-08-18 German A. Arias * Tools/Makefile.preamble: Add flag -Wl,--allow-shlib-undefined, diff --git a/EOControl/EOClassDescription.m b/EOControl/EOClassDescription.m index 62a6310..39a3638 100644 --- a/EOControl/EOClassDescription.m +++ b/EOControl/EOClassDescription.m @@ -671,14 +671,15 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext - (NSString *)userPresentableDescriptionForObject:(id)object { - NSArray *attrArray = [self attributeKeys]; - NSEnumerator *attrEnum = [attrArray objectEnumerator]; - NSMutableString *values - = [NSMutableString stringWithCapacity: 4 * [attrArray count]]; + NSArray *attrArray; + NSEnumerator *attrEnum; + NSMutableString *values; NSString *key; BOOL init = YES; + attrArray = [self attributeKeys]; attrEnum = [attrArray objectEnumerator]; + values = [NSMutableString stringWithCapacity: 4 * [attrArray count]]; while ((key = [attrEnum nextObject])) {