gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-22 19:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWeb/GSWContext.m

Browse source 
remove useless comparison
        * GSWeb/GSWDeclarationParser.m
          fix some format strings and variables used in there
        * Add method to interface and remove a cast
          from bug report 39088



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@36680 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sebastian Reitenbach 2013-05-30 08:23:52 +00:00
parent 65807fb6e8
commit 0077c8591e
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2013-05-30: Graham Lee <iamleeg@gmail.com>
* GSWeb/GSWContext.m
remove useless comparison
* GSWeb/GSWDeclarationParser.m
fix some format strings and variables used in there
* Add method to interface and remove a cast
from bug report 39088
2013-05-29: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de> 2013-05-29: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* GSWeb/GNUmakefile * GSWeb/GNUmakefile
* GSWeb/GSWProcFS.m * GSWeb/GSWProcFS.m

2
GSWeb/GSWContext.m
View file

@ -530,7 +530,7 @@ GSWEB_EXPORT BOOL GSWContext_isSenderIDSearchOver(GSWContext* aContext)
@"50.", @"51.", @"52.", @"53.", @"54.", @"55.", @"56.", @"57.", @"58.", @"59.", @"50.", @"51.", @"52.", @"53.", @"54.", @"55.", @"56.", @"57.", @"58.", @"59.",
@"60.", @"61.", @"62.", @"63.", @"64.", @"65.", @"66.", @"67.", @"68.", @"69." }; @"60.", @"61.", @"62.", @"63.", @"64.", @"65.", @"66.", @"67.", @"68.", @"69." };
static int preBuiltNumPlusDotCount = sizeof(preBuiltNumPlusDot)/sizeof(NSString*); static int preBuiltNumPlusDotCount = sizeof(preBuiltNumPlusDot)/sizeof(NSString*);
if (_contextID>=0 && _contextID<preBuiltNumPlusDotCount) if (_contextID<preBuiltNumPlusDotCount)
{ {
if (_elementID) if (_elementID)
return [preBuiltNumPlusDot[_contextID] stringByAppendingString: return [preBuiltNumPlusDot[_contextID] stringByAppendingString:

12
GSWeb/GSWDeclarationParser.m
View file

@ -462,7 +462,7 @@ static inline GSWDeclaration* parseDeclaration(GSWDeclarationParser* parser)
{ {
[_string getCharacters:_uniBuf]; [_string getCharacters:_uniBuf];
NSDebugMLog(@"index=%d length=%d",index,_length); NSDebugMLog(@"index=%d length=%d",_index,_length);
//ParserDebugLogBuffer(_uniBuf,_length,_index,_length); //ParserDebugLogBuffer(_uniBuf,_length,_index,_length);
while(_index<_length) while(_index<_length)
@ -644,7 +644,7 @@ static inline GSWDeclaration* parseDeclaration(GSWDeclarationParser* parser)
[GSWDeclarationFormatException [GSWDeclarationFormatException
raise:GSWDFEMissingPragmaDelegate raise:GSWDFEMissingPragmaDelegate
format:@"In %@ %@: No pragma delegate for pragma directive '%@'", format:@"In %@ %@: No pragma delegate for pragma directive '%@'",
_frameworkName,_fileName]; _frameworkName,_fileName,pragmaDirective];
} }
else else
{ {
@ -669,8 +669,8 @@ static inline GSWDeclaration* parseDeclaration(GSWDeclarationParser* parser)
{ {
[GSWDeclarationFormatException [GSWDeclarationFormatException
raise:GSWDFEUnknownPragmaDirective raise:GSWDFEUnknownPragmaDirective
format:@"In %@ %@: Unknown pragma directive '%@' at line %@", format:@"In %@ %@: Unknown pragma directive '%@' at line %d",
_frameworkName,_fileName, _frameworkName,_fileName,pragmaDirective,
[self lineIndexFromIndex:startIndex]]; [self lineIndexFromIndex:startIndex]];
}; };
//ParserDebugLogBuffer(_uniBuf,_length,_index,_length); //ParserDebugLogBuffer(_uniBuf,_length,_index,_length);
@ -1245,7 +1245,7 @@ Returns a NSString
{ {
[GSWDeclarationFormatException [GSWDeclarationFormatException
raise:GSWDFEUnexpectedBufferEnd raise:GSWDFEUnexpectedBufferEnd
format:@"In %@ %@: Reached buffer end while trying to parse value of a dictionary entry", format:@"In %@ %@: Reached buffer end while trying to parse value of a dictionary entry at line %d",
_frameworkName,_fileName, _frameworkName,_fileName,
[self lineIndexFromIndex:keyStartIndex]]; [self lineIndexFromIndex:keyStartIndex]];
} }
@ -1260,7 +1260,7 @@ Returns a NSString
{ {
[GSWDeclarationFormatException [GSWDeclarationFormatException
raise:GSWDFEUnexpectedBufferEnd raise:GSWDFEUnexpectedBufferEnd
format:@"In %@ %@: Reached buffer end while trying to parse value of a dictionary entry", format:@"In %@ %@: Reached buffer end while trying to parse value of a dictionary entry at line %d",
_frameworkName,_fileName, _frameworkName,_fileName,
[self lineIndexFromIndex:keyStartIndex]]; [self lineIndexFromIndex:keyStartIndex]];
} }

5
GSWeb/GSWMultiKeyDictionary.m
View file

@ -979,6 +979,9 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
GSWMultiKeyDictionary* _dictionary; GSWMultiKeyDictionary* _dictionary;
NSMutableArray* _objects; NSMutableArray* _objects;
} }
-(id)initWithDictionary:(GSWMultiKeyDictionary*)d;
@end @end
//============================================================================== //==============================================================================
@ -1431,7 +1434,7 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
{ {
return AUTORELEASE([[GSWMultiKeyDictionaryObjectEnumerator return AUTORELEASE([[GSWMultiKeyDictionaryObjectEnumerator
allocWithZone:NSDefaultMallocZone()] allocWithZone:NSDefaultMallocZone()]
initWithDictionary: (NSDictionary*)self]); initWithDictionary: self]);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------