Minor fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13904 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-06-17 15:47:09 +00:00
parent 6c640c721f
commit 5530b2dd9f
2 changed files with 6 additions and 3 deletions

View file

@ -6,6 +6,7 @@
Changes based on bug report by Andy Ruder <aeruder@yahoo.com>
* Source/NSURL.m: Fixed one possible nul pointer indirection,
and added some comments about the internal data structure.
* Tools/plmerge.m: Fixed some crasher bugs where given bad arguments.
2002-06-16 Richard Frith-Macdonald <rfm@gnu.org>

View file

@ -90,8 +90,8 @@ main(int argc, char** argv, char **env)
for (i = 2; i < [args count]; i++)
{
NSString *filename = [args objectAtIndex: i];
NSString *key;
id object;
NSString *key = filename;
id object = nil;
NS_DURING
{
@ -105,7 +105,9 @@ main(int argc, char** argv, char **env)
NS_ENDHANDLER
if ([[filename pathExtension] isEqualToString: @"plist"])
key = [filename stringByDeletingPathExtension];
{
key = [filename stringByDeletingPathExtension];
}
if (object == nil)
NSLog(@"Parsing '%@' - nil property list", filename);