Skip to content

Commit 473e14c

Browse files
committed
Revert changes to formatted_print.c
1 parent d4e1f8e commit 473e14c

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

ext/standard/formatted_print.c

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| obtain it through the world-wide-web, please send a note to |
1111
| license@php.net so we can mail you a copy immediately. |
1212
+----------------------------------------------------------------------+
13-
| Author: Stig Söther Bakken <ssb@php.net> |
13+
| Author: Stig S�ther Bakken <ssb@php.net> |
1414
+----------------------------------------------------------------------+
1515
*/
1616

@@ -634,14 +634,15 @@ php_formatted_print(char *format, size_t format_len, zval *args, int argc, int n
634634

635635
case 'd':
636636
php_sprintf_appendint(&result, &outpos,
637-
zval_get_long_ex(tmp, /* is_strict */ false),
638-
width, padding, alignment, always_sign);
637+
zval_get_long(tmp),
638+
width, padding, alignment,
639+
always_sign);
639640
break;
640641

641642
case 'u':
642643
php_sprintf_appenduint(&result, &outpos,
643-
zval_get_long_ex(tmp, /* is_strict */ false),
644-
width, padding, alignment);
644+
zval_get_long(tmp),
645+
width, padding, alignment);
645646
break;
646647

647648
case 'e':
@@ -662,31 +663,35 @@ php_formatted_print(char *format, size_t format_len, zval *args, int argc, int n
662663

663664
case 'c':
664665
php_sprintf_appendchar(&result, &outpos,
665-
(char) zval_get_long_ex(tmp, /* is_strict */ false));
666+
(char) zval_get_long(tmp));
666667
break;
667668

668669
case 'o':
669670
php_sprintf_append2n(&result, &outpos,
670-
zval_get_long_ex(tmp, /* is_strict */ false),
671-
width, padding, alignment, 3, hexchars, expprec);
671+
zval_get_long(tmp),
672+
width, padding, alignment, 3,
673+
hexchars, expprec);
672674
break;
673675

674676
case 'x':
675677
php_sprintf_append2n(&result, &outpos,
676-
zval_get_long_ex(tmp, /* is_strict */ false),
677-
width, padding, alignment, 4, hexchars, expprec);
678+
zval_get_long(tmp),
679+
width, padding, alignment, 4,
680+
hexchars, expprec);
678681
break;
679682

680683
case 'X':
681684
php_sprintf_append2n(&result, &outpos,
682-
zval_get_long_ex(tmp, /* is_strict */ false),
683-
width, padding, alignment, 4, HEXCHARS, expprec);
685+
zval_get_long(tmp),
686+
width, padding, alignment, 4,
687+
HEXCHARS, expprec);
684688
break;
685689

686690
case 'b':
687691
php_sprintf_append2n(&result, &outpos,
688-
zval_get_long_ex(tmp, /* is_strict */ false),
689-
width, padding, alignment, 1, hexchars, expprec);
692+
zval_get_long(tmp),
693+
width, padding, alignment, 1,
694+
hexchars, expprec);
690695
break;
691696

692697
case '%':

0 commit comments

Comments
 (0)