Skip to content

Commit 02e48d9

Browse files
GirgiasGirgias
committed
Use standard 64bit signed int type
1 parent 9778554 commit 02e48d9

File tree

3 files changed

+32
-41
lines changed

3 files changed

+32
-41
lines changed

‎main/snprintf.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ PHPAPI char *php_gcvt(double value, int ndigit, char dec_point, char exponent, c
308308
* is declared as buf[ 100 ], buf_end should be &buf[ 100 ])
309309
*/
310310
/* char * ap_php_conv_10() {{{ */
311-
PHPAPI char * ap_php_conv_10(register wide_int num, register bool is_unsigned,
311+
PHPAPI char * ap_php_conv_10(register int64_t num, register bool is_unsigned,
312312
register bool * is_negative, char *buf_end, register size_t *len)
313313
{
314314
register char *p = buf_end;
@@ -330,7 +330,7 @@ PHPAPI char * ap_php_conv_10(register wide_int num, register bool is_unsigned,
330330
* d. add 1
331331
*/
332332
if (*is_negative) {
333-
wide_int t = num + 1;
333+
int64_t t = num + 1;
334334
magnitude = ((uint64_t) - t) + 1;
335335
} else {
336336
magnitude = (uint64_t) num;
@@ -441,7 +441,7 @@ PHPAPI char * php_conv_fp(register char format, register double num,
441441
*s++ = format; /* either e or E */
442442
decimal_point--;
443443
if (decimal_point != 0) {
444-
p = ap_php_conv_10((wide_int) decimal_point, false, &exponent_is_negative, &temp[EXPONENT_LENGTH], &t_len);
444+
p = ap_php_conv_10((int64_t) decimal_point, false, &exponent_is_negative, &temp[EXPONENT_LENGTH], &t_len);
445445
*s++ = exponent_is_negative ? '-' : '+';
446446

447447
/*
@@ -587,7 +587,7 @@ static size_t format_converter(register buffy * odp, const char *fmt, va_list ap
587587
char prefix_char;
588588

589589
double fp_num;
590-
wide_int i_num = (wide_int) 0;
590+
int64_t i_num = (int64_t) 0;
591591
uint64_t ui_num;
592592

593593
char num_buf[NUM_BUF_SIZE];
@@ -776,29 +776,29 @@ static size_t format_converter(register buffy * odp, const char *fmt, va_list ap
776776
case 'u':
777777
switch(modifier) {
778778
default:
779-
i_num = (wide_int) va_arg(ap, unsigned int);
779+
i_num = (int64_t) va_arg(ap, unsigned int);
780780
break;
781781
case LM_LONG_DOUBLE:
782782
goto fmt_error;
783783
case LM_LONG:
784-
i_num = (wide_int) va_arg(ap, unsigned long int);
784+
i_num = (int64_t) va_arg(ap, unsigned long int);
785785
break;
786786
case LM_SIZE_T:
787-
i_num = (wide_int) va_arg(ap, size_t);
787+
i_num = (int64_t) va_arg(ap, size_t);
788788
break;
789789
#if SIZEOF_LONG_LONG
790790
case LM_LONG_LONG:
791-
i_num = (wide_int) va_arg(ap, unsigned long long int);
791+
i_num = (int64_t) va_arg(ap, unsigned long long int);
792792
break;
793793
#endif
794794
#if SIZEOF_INTMAX_T
795795
case LM_INTMAX_T:
796-
i_num = (wide_int) va_arg(ap, uintmax_t);
796+
i_num = (int64_t) va_arg(ap, uintmax_t);
797797
break;
798798
#endif
799799
#if SIZEOF_PTRDIFF_T
800800
case LM_PTRDIFF_T:
801-
i_num = (wide_int) va_arg(ap, ptrdiff_t);
801+
i_num = (int64_t) va_arg(ap, ptrdiff_t);
802802
break;
803803
#endif
804804
}
@@ -815,33 +815,33 @@ static size_t format_converter(register buffy * odp, const char *fmt, va_list ap
815815
if ((*fmt) != 'u') {
816816
switch(modifier) {
817817
default:
818-
i_num = (wide_int) va_arg(ap, int);
818+
i_num = (int64_t) va_arg(ap, int);
819819
break;
820820
case LM_LONG_DOUBLE:
821821
goto fmt_error;
822822
case LM_LONG:
823-
i_num = (wide_int) va_arg(ap, long int);
823+
i_num = (int64_t) va_arg(ap, long int);
824824
break;
825825
case LM_SIZE_T:
826826
#if SIZEOF_SSIZE_T
827-
i_num = (wide_int) va_arg(ap, ssize_t);
827+
i_num = (int64_t) va_arg(ap, ssize_t);
828828
#else
829-
i_num = (wide_int) va_arg(ap, size_t);
829+
i_num = (int64_t) va_arg(ap, size_t);
830830
#endif
831831
break;
832832
#if SIZEOF_LONG_LONG
833833
case LM_LONG_LONG:
834-
i_num = (wide_int) va_arg(ap, wide_int);
834+
i_num = (int64_t) va_arg(ap, long long int);
835835
break;
836836
#endif
837837
#if SIZEOF_INTMAX_T
838838
case LM_INTMAX_T:
839-
i_num = (wide_int) va_arg(ap, intmax_t);
839+
i_num = (int64_t) va_arg(ap, intmax_t);
840840
break;
841841
#endif
842842
#if SIZEOF_PTRDIFF_T
843843
case LM_PTRDIFF_T:
844-
i_num = (wide_int) va_arg(ap, ptrdiff_t);
844+
i_num = (int64_t) va_arg(ap, ptrdiff_t);
845845
break;
846846
#endif
847847
}

‎main/snprintf.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,7 @@ typedef enum {
126126
LM_LONG_DOUBLE,
127127
} length_modifier_e;
128128

129-
#ifdef PHP_WIN32
130-
# define WIDE_INT __int64
131-
#elif SIZEOF_LONG_LONG
132-
# define WIDE_INT long long
133-
#else
134-
# define WIDE_INT long
135-
#endif
136-
typedef WIDE_INT wide_int;
137-
138-
PHPAPI char * ap_php_conv_10(wide_int num, bool is_unsigned,
129+
PHPAPI char * ap_php_conv_10(int64_t num, bool is_unsigned,
139130
bool * is_negative, char *buf_end, size_t *len);
140131

141132
PHPAPI char * ap_php_conv_p2(uint64_t num, int nbits,

‎main/spprintf.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static void xbuf_format_converter(void *xbuf, bool is_char, const char *fmt, va_
197197
char prefix_char;
198198

199199
double fp_num;
200-
wide_int i_num = (wide_int) 0;
200+
int64_t i_num = (int64_t) 0;
201201
uint64_t ui_num = (uint64_t) 0;
202202

203203
char num_buf[NUM_BUF_SIZE];
@@ -383,29 +383,29 @@ static void xbuf_format_converter(void *xbuf, bool is_char, const char *fmt, va_
383383
case 'u':
384384
switch(modifier) {
385385
default:
386-
i_num = (wide_int) va_arg(ap, unsigned int);
386+
i_num = (int64_t) va_arg(ap, unsigned int);
387387
break;
388388
case LM_LONG_DOUBLE:
389389
goto fmt_error;
390390
case LM_LONG:
391-
i_num = (wide_int) va_arg(ap, unsigned long int);
391+
i_num = (int64_t) va_arg(ap, unsigned long int);
392392
break;
393393
case LM_SIZE_T:
394-
i_num = (wide_int) va_arg(ap, size_t);
394+
i_num = (int64_t) va_arg(ap, size_t);
395395
break;
396396
#if SIZEOF_LONG_LONG
397397
case LM_LONG_LONG:
398-
i_num = (wide_int) va_arg(ap, unsigned long long int);
398+
i_num = (int64_t) va_arg(ap, unsigned long long int);
399399
break;
400400
#endif
401401
#if SIZEOF_INTMAX_T
402402
case LM_INTMAX_T:
403-
i_num = (wide_int) va_arg(ap, uintmax_t);
403+
i_num = (int64_t) va_arg(ap, uintmax_t);
404404
break;
405405
#endif
406406
#if SIZEOF_PTRDIFF_T
407407
case LM_PTRDIFF_T:
408-
i_num = (wide_int) va_arg(ap, ptrdiff_t);
408+
i_num = (int64_t) va_arg(ap, ptrdiff_t);
409409
break;
410410
#endif
411411
}
@@ -422,33 +422,33 @@ static void xbuf_format_converter(void *xbuf, bool is_char, const char *fmt, va_
422422
if ((*fmt) != 'u') {
423423
switch(modifier) {
424424
default:
425-
i_num = (wide_int) va_arg(ap, int);
425+
i_num = (int64_t) va_arg(ap, int);
426426
break;
427427
case LM_LONG_DOUBLE:
428428
goto fmt_error;
429429
case LM_LONG:
430-
i_num = (wide_int) va_arg(ap, long int);
430+
i_num = (int64_t) va_arg(ap, long int);
431431
break;
432432
case LM_SIZE_T:
433433
#if SIZEOF_SSIZE_T
434-
i_num = (wide_int) va_arg(ap, ssize_t);
434+
i_num = (int64_t) va_arg(ap, ssize_t);
435435
#else
436-
i_num = (wide_int) va_arg(ap, size_t);
436+
i_num = (int64_t) va_arg(ap, size_t);
437437
#endif
438438
break;
439439
#if SIZEOF_LONG_LONG
440440
case LM_LONG_LONG:
441-
i_num = (wide_int) va_arg(ap, wide_int);
441+
i_num = (int64_t) va_arg(ap, long long int);
442442
break;
443443
#endif
444444
#if SIZEOF_INTMAX_T
445445
case LM_INTMAX_T:
446-
i_num = (wide_int) va_arg(ap, intmax_t);
446+
i_num = (int64_t) va_arg(ap, intmax_t);
447447
break;
448448
#endif
449449
#if SIZEOF_PTRDIFF_T
450450
case LM_PTRDIFF_T:
451-
i_num = (wide_int) va_arg(ap, ptrdiff_t);
451+
i_num = (int64_t) va_arg(ap, ptrdiff_t);
452452
break;
453453
#endif
454454
}

0 commit comments

Comments
 (0)