AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4384 Remove tabs and make a function static

Browse Source 
X-SVN-Rev: 23455
This commit is contained in:
George Rhoten 2008-02-18 23:17:58 +00:00
parent d9868ddec2
commit 549ab03a99
1 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
icu4c/source/io/uprntf_p.c
View File

@ -1043,31 +1043,31 @@ static const u_printf_info g_u_printf_infos[UPRINTF_NUM_FMT_HANDLERS] = {
(s) == MOD_LOWERL || \
(s) == MOD_L
/* Returns an array of the parsed argument type given in the format string. */
ufmt_args* parseArguments(const UChar *alias, va_list ap, UErrorCode *status) {
ufmt_args *arglist = NULL;
ufmt_type_info *typelist = NULL;
UBool *islonglong = NULL;
int32_t size = 0;
int32_t pos = 0;
UChar type;
uint16_t handlerNum;
const UChar *aliasStart = alias;
/* get maximum number of arguments */
for(;;) {
/* find % */
while(*alias != UP_PERCENT && *alias != 0x0000) {
static ufmt_args* parseArguments(const UChar *alias, va_list ap, UErrorCode *status) {
ufmt_args *arglist = NULL;
ufmt_type_info *typelist = NULL;
UBool *islonglong = NULL;
int32_t size = 0;
int32_t pos = 0;
UChar type;
uint16_t handlerNum;
const UChar *aliasStart = alias;
/* get maximum number of arguments */
for(;;) {
/* find % */
while(*alias != UP_PERCENT && *alias != 0x0000) {
alias++;
}
if(*alias == 0x0000) {
if(*alias == 0x0000) {
break;
}
alias++;
/* handle the pos number */
if(ISDIGIT(*alias)) {
alias++;
/* handle the pos number */
if(ISDIGIT(*alias)) {
/* handle positional parameters */
if(ISDIGIT(*alias)) {
@ -1084,52 +1084,52 @@ ufmt_args* parseArguments(const UChar *alias, va_list ap, UErrorCode *status) {
return NULL;
}
} else {
return NULL;
return NULL;
}
if (pos > size) {
size = pos;
}
}
/* create the parsed argument list */
typelist = (ufmt_type_info*)uprv_malloc(sizeof(ufmt_type_info) * size);
islonglong = (UBool*)uprv_malloc(sizeof(UBool) * size);
arglist = (ufmt_args*)uprv_malloc(sizeof(ufmt_args) * size);
/* If malloc failed, return NULL */
if (!typelist || !islonglong || !arglist) {
if (typelist) {
uprv_free(typelist);
}
if (islonglong) {
uprv_free(islonglong);
}
if (arglist) {
uprv_free(arglist);
}
*status = U_MEMORY_ALLOCATION_ERROR;
return NULL;
}
/* reset alias back to the beginning */
alias = aliasStart;
for(;;) {
/* find % */
while(*alias != UP_PERCENT && *alias != 0x0000) {
if (pos > size) {
size = pos;
}
}
/* create the parsed argument list */
typelist = (ufmt_type_info*)uprv_malloc(sizeof(ufmt_type_info) * size);
islonglong = (UBool*)uprv_malloc(sizeof(UBool) * size);
arglist = (ufmt_args*)uprv_malloc(sizeof(ufmt_args) * size);
/* If malloc failed, return NULL */
if (!typelist || !islonglong || !arglist) {
if (typelist) {
uprv_free(typelist);
}
if (islonglong) {
uprv_free(islonglong);
}
if (arglist) {
uprv_free(arglist);
}
*status = U_MEMORY_ALLOCATION_ERROR;
return NULL;
}
/* reset alias back to the beginning */
alias = aliasStart;
for(;;) {
/* find % */
while(*alias != UP_PERCENT && *alias != 0x0000) {
alias++;
}
if(*alias == 0x0000) {
if(*alias == 0x0000) {
break;
}
alias++;
alias++;
/* handle positional parameters */
if(ISDIGIT(*alias)) {
pos = (int) (*alias++ - DIGIT_ZERO);
@ -1142,32 +1142,32 @@ ufmt_args* parseArguments(const UChar *alias, va_list ap, UErrorCode *status) {
/* offset position by 1 */
pos--;
/* skip over everything except for the type */
while (ISMOD(*alias) || ISFLAG(*alias) || ISDIGIT(*alias) ||
*alias == SPEC_ASTERISK || *alias == SPEC_PERIOD || *alias == SPEC_DOLLARSIGN) {
islonglong[pos] = FALSE;
if (ISMOD(*alias)) {
alias++;
if (*alias == MOD_LOWERL) {
islonglong[pos] = TRUE;
}
}
alias++;
}
type = *alias;
/* store the argument type in the correct position of the parsed argument list */
handlerNum = (uint16_t)(type - UPRINTF_BASE_FMT_HANDLERS);
if (handlerNum < UPRINTF_NUM_FMT_HANDLERS) {
typelist[pos] = g_u_printf_infos[ handlerNum ].info;
} else {
typelist[pos] = ufmt_empty;
}
}
/* store argument in arglist */
for (pos = 0; pos < size; pos++) {
switch (typelist[pos]) {
/* skip over everything except for the type */
while (ISMOD(*alias) || ISFLAG(*alias) || ISDIGIT(*alias) ||
*alias == SPEC_ASTERISK || *alias == SPEC_PERIOD || *alias == SPEC_DOLLARSIGN) {
islonglong[pos] = FALSE;
if (ISMOD(*alias)) {
alias++;
if (*alias == MOD_LOWERL) {
islonglong[pos] = TRUE;
}
}
alias++;
}
type = *alias;
/* store the argument type in the correct position of the parsed argument list */
handlerNum = (uint16_t)(type - UPRINTF_BASE_FMT_HANDLERS);
if (handlerNum < UPRINTF_NUM_FMT_HANDLERS) {
typelist[pos] = g_u_printf_infos[ handlerNum ].info;
} else {
typelist[pos] = ufmt_empty;
}
}
/* store argument in arglist */
for (pos = 0; pos < size; pos++) {
switch (typelist[pos]) {
case ufmt_string:
case ufmt_ustring:
case ufmt_pointer:
@ -1194,12 +1194,12 @@ ufmt_args* parseArguments(const UChar *alias, va_list ap, UErrorCode *status) {
arglist[pos].ptrValue = NULL;
break;
}
}
uprv_free(typelist);
uprv_free(islonglong);
}
return arglist;
uprv_free(typelist);
uprv_free(islonglong);
return arglist;
}
/* We parse the argument list in Unicode */
@ -1227,13 +1227,13 @@ u_printf_parse(const u_printf_stream_handler *streamHandler,
ufmt_args *arglist;
UErrorCode status = U_ZERO_ERROR;
if (!locStringContext || locStringContext->available >= 0) {
/* get the parsed list of argument types */
arglist = parseArguments(orgAlias, ap, &status);
/* Return error if parsing failed. */
if (U_FAILURE(status)) {
return -1;
}
/* get the parsed list of argument types */
arglist = parseArguments(orgAlias, ap, &status);
/* Return error if parsing failed. */
if (U_FAILURE(status)) {
return -1;
}
}
/* iterate through the pattern */
@ -1580,7 +1580,7 @@ u_printf_parse(const u_printf_stream_handler *streamHandler,
}
/* delete parsed argument list */
if (arglist != NULL) {
uprv_free(arglist);
uprv_free(arglist);
}
/* return # of characters in this format that have been parsed. */
return (int32_t)(alias - fmt);