ICU-3499 Fix for os/400
X-SVN-Rev: 15433
This commit is contained in:
parent
fa93449437
commit
502f981e13
@ -113,7 +113,7 @@ u_vsscanf_u(const UChar *buffer,
|
||||
return 0;
|
||||
}
|
||||
|
||||
converted = u_scanf_parse(&inStr, patternSpecification, (va_list*)&ap);
|
||||
converted = u_scanf_parse(&inStr, patternSpecification, ap);
|
||||
|
||||
u_locbund_close(&inStr.str.fBundle);
|
||||
|
||||
|
@ -98,7 +98,7 @@ u_vfscanf_u(UFILE *f,
|
||||
const UChar *patternSpecification,
|
||||
va_list ap)
|
||||
{
|
||||
return u_scanf_parse(f, patternSpecification, (va_list*)&ap);
|
||||
return u_scanf_parse(f, patternSpecification, ap);
|
||||
}
|
||||
|
||||
#endif /* #if !UCONFIG_NO_FORMATTING */
|
||||
|
@ -28,7 +28,7 @@
|
||||
U_CFUNC int32_t
|
||||
u_scanf_parse(UFILE *f,
|
||||
const UChar *patternSpecification,
|
||||
va_list *ap);
|
||||
va_list ap);
|
||||
|
||||
#endif /* #if !UCONFIG_NO_FORMATTING */
|
||||
|
||||
|
@ -1172,7 +1172,7 @@ static const u_scanf_info g_u_scanf_infos[USCANF_NUM_FMT_HANDLERS] = {
|
||||
U_CFUNC int32_t
|
||||
u_scanf_parse(UFILE *f,
|
||||
const UChar *patternSpecification,
|
||||
va_list *ap)
|
||||
va_list ap)
|
||||
{
|
||||
const UChar *alias;
|
||||
int32_t count, converted, temp;
|
||||
@ -1227,11 +1227,11 @@ u_scanf_parse(UFILE *f,
|
||||
case ufmt_pointer:
|
||||
case ufmt_float:
|
||||
case ufmt_double:
|
||||
args.ptrValue = va_arg(*ap, void*);
|
||||
args.ptrValue = va_arg(ap, void*);
|
||||
break;
|
||||
|
||||
case ufmt_count:
|
||||
args.int64Value = va_arg(*ap, int);
|
||||
args.int64Value = va_arg(ap, int);
|
||||
/* set the spec's width to the # of items converted */
|
||||
spec.fInfo.fWidth = converted;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user