Differences From Artifact [eefc8c03cc]:
- File src/of_asprintf.m — part of check-in [13768d7743] at 2017-05-06 22:06:51 on branch trunk — configure: Check for wchar_t and wchar.h (user: js, size: 16122) [annotate] [blame] [check-ins using]
To Artifact [dfdbe062d8]:
- File
src/of_asprintf.m
— part of check-in
[4af49a13c3]
at
2017-05-07 20:10:13
on branch trunk
— Small code style change
Casts are now written like types in variable declarations. (user: js, size: 16128) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
404 405 406 407 408 409 410 |
if (ctx->lengthModifier != LENGTH_MODIFIER_NONE)
return false;
ctx->subformat[ctx->subformatLen - 1] = 's';
{
const of_unichar_t *arg =
| | | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 |
if (ctx->lengthModifier != LENGTH_MODIFIER_NONE)
return false;
ctx->subformat[ctx->subformatLen - 1] = 's';
{
const of_unichar_t *arg =
va_arg(ctx->arguments, const of_unichar_t *);
size_t j, len = of_string_utf32_length(arg);
char *buffer;
if (SIZE_MAX / 4 < len || (SIZE_MAX / 4) - len < 1)
return false;
if ((buffer = malloc((len * 4) + 1)) == NULL)
|
| ︙ | ︙ | |||
599 600 601 602 603 604 605 |
}
break;
case 's':
switch (ctx->lengthModifier) {
case LENGTH_MODIFIER_NONE:
tmpLen = asprintf(&tmp, ctx->subformat,
| | | | | < | | | | | | | | 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 |
}
break;
case 's':
switch (ctx->lengthModifier) {
case LENGTH_MODIFIER_NONE:
tmpLen = asprintf(&tmp, ctx->subformat,
va_arg(ctx->arguments, const char *));
break;
#ifdef HAVE_WCHAR_T
case LENGTH_MODIFIER_L:
tmpLen = asprintf(&tmp, ctx->subformat,
va_arg(ctx->arguments, const wchar_t *));
break;
#endif
default:
return false;
}
break;
case 'p':
if (ctx->lengthModifier != LENGTH_MODIFIER_NONE)
return false;
tmpLen = asprintf(&tmp, ctx->subformat,
va_arg(ctx->arguments, void *));
break;
case 'n':
switch (ctx->lengthModifier) {
case LENGTH_MODIFIER_NONE:
*va_arg(ctx->arguments, int *) = (int)ctx->bufferLen;
break;
case LENGTH_MODIFIER_HH:
*va_arg(ctx->arguments, signed char *) =
(signed char)ctx->bufferLen;
break;
case LENGTH_MODIFIER_H:
*va_arg(ctx->arguments, short *) =
(short)ctx->bufferLen;
break;
case LENGTH_MODIFIER_L:
*va_arg(ctx->arguments, long *) =
(long)ctx->bufferLen;
break;
case LENGTH_MODIFIER_LL:
*va_arg(ctx->arguments, long long *) =
(long long)ctx->bufferLen;
break;
case LENGTH_MODIFIER_J:
*va_arg(ctx->arguments, intmax_t *) =
(intmax_t)ctx->bufferLen;
break;
case LENGTH_MODIFIER_Z:
*va_arg(ctx->arguments, size_t *) =
(size_t)ctx->bufferLen;
break;
case LENGTH_MODIFIER_T:
*va_arg(ctx->arguments, ptrdiff_t *) =
(ptrdiff_t)ctx->bufferLen;
break;
default:
return false;
}
break;
|
| ︙ | ︙ | |||
694 695 696 697 698 699 700 | ctx->last = ctx->i + 1; ctx->state = STATE_STRING; return true; } | | | 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 |
ctx->last = ctx->i + 1;
ctx->state = STATE_STRING;
return true;
}
static bool (*states[])(struct context *) = {
stringState,
formatFlagsState,
formatFieldWidthState,
formatLengthModifierState,
formatConversionSpecifierState
};
|
| ︙ | ︙ |