gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 12:55:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Tools/EOModel+GSDoc.m (-[gsdocContentSplittedByEntities:idPtr:]):

Browse source 
Split out parameters into local variables.  Fix format string to
	match parameters.
	Reported by: Federico Gimenez Nieto, Sergey Golovin.
	Fix reported by: Richard Frith-Macdonald.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30079 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2010-03-30 09:29:41 +00:00
parent 719c9cedc1
commit d3a53480c1
2 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,5 +1,11 @@
2010-03-30 David Ayers <ayers@fsfe.org>
* Tools/EOModel+GSDoc.m (-[gsdocContentSplittedByEntities:idPtr:]):
Split out parameters into local variables. Fix format string to
match parameters.
Reported by: Federico Gimenez Nieto, Sergey Golovin.
Fix reported by: Richard Frith-Macdonald.
* EOControl/EONSAddOns.m (GSUseStrictWO451Compatibility): Avoid usage
of GS_INITIALIZED_LOCK.
* EOControl/EOPrivate.h/m (GDL2_AssignAtomicallyIfNil): New convenience

39
Tools/EOModel+GSDoc.m
View file

@ -72,27 +72,30 @@ RCS_ID("$Id$")
NSArray *entities = [self entities];
int i, count = [entities count];
NSString *chapter = [self name]
? [NSString stringWithFormat: @" id=\"%@\"", [self name]]
: @"";
NSString *model = [self name] ? [self name] : @"";
NSString *debugId = xmlIdPtr
? [NSString stringWithFormat: @" debugId=\"%d\"", (*xmlIdPtr)++]
: @"";
NSString *name = ([self name]
? [NSString stringWithFormat: @" name=\"%@\"", [self name]]
: @"");
NSString *adaptorName = [self adaptorName]
? [NSString stringWithFormat: @" adaptorName=\"%@\"", [self adaptorName]]
: @"";
NSString *adaptorClassName = [self adaptorClassName]
? [NSString stringWithFormat: @" adaptorClassName=\"%@\"",
[self adaptorClassName]]
: @" adaptorClassName=\"\"";
NSLog(@"Start: %@", [self class]);
content = [content stringByAppendingFormat:
@"<chapter%@>\n<heading>EOModel %@</heading>\n<EOModel %@%@%@%@%@>\n",
([self name]
? [NSString stringWithFormat: @" id=\"%@\"",
[self name]] : @""),
([self name] ? [self name] : @""),
(xmlIdPtr
? [NSString stringWithFormat: @" debugId=\"%d\"",
(*xmlIdPtr)++] : @""),
([self name]
? [NSString stringWithFormat: @" name=\"%@\"",
[self name]] : @""),
([self adaptorName]
? [NSString stringWithFormat: @" adaptorName=\"%@\"",
[self adaptorName]] : @""),
([self adaptorClassName]
? [NSString stringWithFormat: @" adaptorClassName=\"%@\"",
[self adaptorClassName]]
: @" adaptorClassName=\"\"")];
@"<chapter%@>\n<heading>EOModel %@</heading>\n<EOModel %@%@%@%@>\n",
chapter, model,
debugId, name, adaptorName, adaptorClassName];
if ([self connectionDictionary])
content = [content stringByAppendingString: