gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-19 09:40:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOControl/EOQualifer.m: Include <stdarg.h> explicitly.

Browse source 
(getKey): Accept pointer to a va_list instead of the value.
	Remove usage of useVAList
	(_qualifierWithArgs): Ditto.
	(qualifierWithQualifierFormat:arguments:): Pass NULL as va_list
	pointer anddrop obsoleted va_list variable and useVAList parameter.
	(qualifierWithQualifierFormat:varargList:): Copy va_list to local
	variable before passing a reference to it.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26470 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2008-04-24 20:55:43 +00:00
parent dde79b7073
commit 8c3975f830
2 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2008-04-24 David Ayers <ayers@fsfe.org>
* EOControl/EOQualifer.m: Include <stdarg.h> explicitly.
(getKey): Accept pointer to a va_list instead of the value.
Remove usage of useVAList
(_qualifierWithArgs): Ditto.
(qualifierWithQualifierFormat:arguments:): Pass NULL as va_list
pointer anddrop obsoleted va_list variable and useVAList parameter.
(qualifierWithQualifierFormat:varargList:): Copy va_list to local
variable before passing a reference to it.
2008-04-03 Matt Rice <ratmice@gmail.com>
* EOAccess/EOSQLExpression.m

38
EOControl/EOQualifier.m
View file

@ -37,6 +37,7 @@ RCS_ID("$Id$")
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
#ifdef GNUSTEP
#include <Foundation/NSCoder.h>
@ -194,9 +195,8 @@ static id
getKey(const unichar **cFormat,
const unichar **s,
BOOL *isKeyValue,
BOOL useVAList,
NSEnumerator *argsEnum,
va_list args)
va_list *args)
{
NSMutableString *key;
NSString *classString = nil;
@ -299,9 +299,9 @@ getKey(const unichar **cFormat,
switch (*(*s+1))
{
case '@':
if (useVAList)
if (args)
{
argObj = va_arg(args, id);
argObj = va_arg(*args, id);
}
else
{
@ -331,9 +331,9 @@ getKey(const unichar **cFormat,
break;
case 's':
if (useVAList)
if (args)
{
argString = va_arg(args, const char *);
argString = va_arg(*args, const char *);
}
else
{
@ -365,9 +365,9 @@ getKey(const unichar **cFormat,
break;
case 'd':
if (useVAList)
if (args)
{
argInt = va_arg(args, int);
argInt = va_arg(*args, int);
}
else
{
@ -399,11 +399,11 @@ getKey(const unichar **cFormat,
break;
case 'f':
if (useVAList)
if (args)
{
/* 'float' is promoted to 'double' when passed through '...'
(so you should pass `double' not `float' to `va_arg') */
argFloat = va_arg(args, double);
argFloat = va_arg(*args, double);
}
else
{
@ -589,7 +589,7 @@ whichQualifier(const unichar **cFormat, const unichar **s)
}
static EOQualifier *
_qualifierWithArgs(id self, SEL _cmd, NSString *format, BOOL useVAList, NSArray *array, va_list args)
_qualifierWithArgs(id self, SEL _cmd, NSString *format, NSArray *array, va_list *args)
{
NSEnumerator *argEnum = [array objectEnumerator];
unichar *s0;
@ -656,9 +656,9 @@ _qualifierWithArgs(id self, SEL _cmd, NSString *format, BOOL useVAList, NSArray
}
notQual = isNotQualifier(&cFormat, &s);
leftKey = getKey(&cFormat, &s, NULL, useVAList, argEnum, args);
leftKey = getKey(&cFormat, &s, NULL, argEnum, args);
operator = getOperator(&cFormat, &s);
rightKey = getKey(&cFormat, &s, &isKeyValue, useVAList, argEnum, args);
rightKey = getKey(&cFormat, &s, &isKeyValue, argEnum, args);
operatorSelector = [EOQualifier operatorSelectorForString: operator];
if (!operatorSelector)
@ -810,15 +810,19 @@ _qualifierWithArgs(id self, SEL _cmd, NSString *format, BOOL useVAList, NSArray
+ (EOQualifier *)qualifierWithQualifierFormat: (NSString *)format
arguments: (NSArray *)args
{
va_list varargs;
return _qualifierWithArgs(self, _cmd, format, NO, args, varargs);
return _qualifierWithArgs(self, _cmd, format, args, NULL);
}
+ (EOQualifier *)qualifierWithQualifierFormat: (NSString *)format
varargList: (va_list)args
{
return _qualifierWithArgs(self, _cmd, format, YES, nil, args);
EOQualifier *qualifier;
va_list varargs;
va_copy(varargs, args);
qualifier = _qualifierWithArgs(self, _cmd, format, nil, &varargs);
va_end(varargs);
return qualifier;
}
+ (EOQualifier *)qualifierToMatchAllValues: (NSDictionary *)values