More tweaks to avoid warnings (minor memory leak fixed in HTMLLinker.m)

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36535 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-04-15 06:04:40 +00:00
parent f371df09b6
commit e1271866b4
7 changed files with 69 additions and 22 deletions

View file

@ -1217,7 +1217,6 @@ static NSString *mainFont = nil;
if ([[tmp name] isEqual: @"desc"] == YES)
{
desc = tmp;
tmp = [tmp nextElement];
}
[buf appendString: indent];
@ -1256,7 +1255,6 @@ static NSString *mainFont = nil;
{
[self incIndent];
[self outputNode: desc to: buf];
desc = nil;
[self decIndent];
}
[buf appendString: indent];
@ -1304,7 +1302,6 @@ static NSString *mainFont = nil;
[buf appendString: @"<p><b>Copyright:</b> (C) "];
[self outputText: [children firstChild] to: buf];
[buf appendString: @"</p>\n"];
children = [children nextElement];
}
}
else if ([name isEqual: @"heading"] == YES)
@ -1373,10 +1370,13 @@ static NSString *mainFont = nil;
}
[buf appendFormat: @"%@@%@ %@ <b>%@</b>;<br />\n", indent, v, t, n];
/*
if ([[children name] isEqual: @"desc"] == YES)
{
children = [children nextElement];
}
*/
/*
* List standards with which ivar complies
*/
@ -1867,7 +1867,6 @@ static NSString *mainFont = nil;
if (node != nil && [[node name] isEqual: @"desc"] == YES)
{
[self outputNode: node to: buf];
node = [node nextElement];
}
[buf appendString: indent];
@ -1962,7 +1961,6 @@ static NSString *mainFont = nil;
{
NSLog(@"Element '%@' not implemented", name); // FIXME
}
node = tmp;
}
}
[arp drain];
@ -2212,13 +2210,15 @@ static NSString *mainFont = nil;
NSDictionary *dProp = [dItem attributes];
NSString *value = [dProp objectForKey: @"value"];
GSXMLNode *dChild;
if (![@"dictionaryItem" isEqualToString: [dItem name]])
{
continue;
}
[buf appendString: indent];
[buf appendString: @"<dt>"];
[buf appendString: [[dProp objectForKey: @"key"] stringByEscapingXML]];
[buf appendString:
[[dProp objectForKey: @"key"] stringByEscapingXML]];
[buf appendString: @" = </dt>\n"];
[buf appendString: indent];
[buf appendString: @"<dd>\n"];
@ -2236,8 +2236,8 @@ static NSString *mainFont = nil;
dChild = [dItem firstChild];
[buf appendString: indent];
}
dItem = [self outputBlock: dChild to: buf inPara: NO];
//PENDING should check that dItem is what it should be...
[self outputBlock: dChild to: buf inPara: NO];
//PENDING use returne value for dItem?
}
[buf appendString: @"\n"];
[self decIndent];

View file

@ -1332,11 +1332,16 @@ recheck:
if ([self skipSpaces] < length && buffer[pos] == '(')
{
unsigned start = pos;
NSString *attr;
[self skipBlock]; // Skip the attributes
attr = [NSString stringWithCharacters: buffer + start
length: pos - start];
if (YES == verbose)
{
NSString *attr;
attr = [NSString stringWithCharacters: buffer + start
length: pos - start];
[self log: @"skip __attribute__ %@", attr];
}
}
else
{
@ -2984,7 +2989,6 @@ fail:
if (flag == YES)
{
exist = nil; // Declaration ... no existing methods.
methods = [NSMutableDictionary dictionaryWithCapacity: 8];
}
else

View file

@ -712,6 +712,7 @@ static int verbose = 0;
/* Generate the output. */
{
NSString *result;
/* Allocate space for the whole output in a single chunk now that
we know how big it should be. */
unichar *outputChars = malloc (sizeof(unichar) * totalNumberOfChars);
@ -738,8 +739,10 @@ static int verbose = 0;
head = s;
}
return [NSString stringWithCharacters: outputChars
length: totalNumberOfChars];
result = [NSString stringWithCharacters: outputChars
length: totalNumberOfChars];
free(outputChars);
return result;
}
}

View file

@ -872,6 +872,10 @@ main(int argc, char **argv, char **env)
verbose = [defs boolForKey: @"Verbose"];
warn = [defs boolForKey: @"Warn"];
if (YES == warn)
{
verbose = YES; // Do we want this?
}
ignoreDependencies = [defs boolForKey: @"IgnoreDependencies"];
showDependencies = [defs boolForKey: @"ShowDependencies"];
if (ignoreDependencies == YES)