gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for bad cast

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23209 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-08-06 05:18:41 +00:00
parent 540989b765
commit 3c803fe41a
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-08-06 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPredicate.m: Reorganize initialisation of scanner to avoid
implicit cast of zero to a va_listt (fix bug #17336)
2006-08-04 23:26-EDT Gregory John Casamento <greg_casamento@yahoo.com> 2006-08-04 23:26-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSKeyedArchiver.m: in _encodeObject:forKey: use replacement * Source/NSKeyedArchiver.m: in _encodeObject:forKey: use replacement

19
Source/NSPredicate.m
View file

@ -52,7 +52,8 @@
} }
- (id) initWithString: (NSString*)format - (id) initWithString: (NSString*)format
args: (NSArray*)args args: (NSArray*)args;
- (id) initWithString: (NSString*)format
vargs: (va_list)vargs; vargs: (va_list)vargs;
- (id) nextArg; - (id) nextArg;
- (BOOL) scanPredicateKeyword: (NSString *) key; - (BOOL) scanPredicateKeyword: (NSString *) key;
@ -158,8 +159,7 @@
NSPredicate *p; NSPredicate *p;
s = [[GSPredicateScanner alloc] initWithString: format s = [[GSPredicateScanner alloc] initWithString: format
args: args args: args];
vargs: 0];
p = [s parse]; p = [s parse];
RELEASE(s); RELEASE(s);
return p; return p;
@ -172,7 +172,6 @@
NSPredicate *p; NSPredicate *p;
s = [[GSPredicateScanner alloc] initWithString: format s = [[GSPredicateScanner alloc] initWithString: format
args: nil
vargs: args]; vargs: args];
p = [s parse]; p = [s parse];
RELEASE(s); RELEASE(s);
@ -1274,13 +1273,20 @@
- (id) initWithString: (NSString*)format - (id) initWithString: (NSString*)format
args: (NSArray*)args args: (NSArray*)args
vargs: (va_list)vargs
{ {
self = [super initWithString: format]; self = [super initWithString: format];
if (self != nil) if (self != nil)
{ {
_args = [args objectEnumerator]; _args = [args objectEnumerator];
if (_args == nil) }
return self;
}
- (id) initWithString: (NSString*)format
vargs: (va_list)vargs
{
self = [super initWithString: format];
if (self != nil)
{ {
#ifdef __va_copy #ifdef __va_copy
__va_copy(_vargs, vargs); __va_copy(_vargs, vargs);
@ -1288,7 +1294,6 @@
_vargs = vargs; _vargs = vargs;
#endif #endif
} }
}
return self; return self;
} }