Skip to content

Commit 9778554

Browse files
GirgiasGirgias
committed
Use standard 64bit unsigned int type
1 parent b901c05 commit 9778554

File tree

3 files changed

+39
-40
lines changed

3 files changed

+39
-40
lines changed

‎main/snprintf.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,10 @@ PHPAPI char * ap_php_conv_10(register wide_int num, register bool is_unsigned,
312312
register bool * is_negative, char *buf_end, register size_t *len)
313313
{
314314
register char *p = buf_end;
315-
register u_wide_int magnitude;
315+
register uint64_t magnitude;
316316

317317
if (is_unsigned) {
318-
magnitude = (u_wide_int) num;
318+
magnitude = (uint64_t) num;
319319
*is_negative = false;
320320
} else {
321321
*is_negative = (num < 0);
@@ -331,17 +331,17 @@ PHPAPI char * ap_php_conv_10(register wide_int num, register bool is_unsigned,
331331
*/
332332
if (*is_negative) {
333333
wide_int t = num + 1;
334-
magnitude = ((u_wide_int) - t) + 1;
334+
magnitude = ((uint64_t) - t) + 1;
335335
} else {
336-
magnitude = (u_wide_int) num;
336+
magnitude = (uint64_t) num;
337337
}
338338
}
339339

340340
/*
341341
* We use a do-while loop so that we write at least 1 digit
342342
*/
343343
do {
344-
register u_wide_int new_magnitude = magnitude / 10;
344+
register uint64_t new_magnitude = magnitude / 10;
345345

346346
*--p = (char)(magnitude - new_magnitude * 10 + '0');
347347
magnitude = new_magnitude;
@@ -471,7 +471,7 @@ PHPAPI char * php_conv_fp(register char format, register double num,
471471
* which is a pointer to the END of the buffer + 1 (i.e. if the buffer
472472
* is declared as buf[ 100 ], buf_end should be &buf[ 100 ])
473473
*/
474-
PHPAPI char * ap_php_conv_p2(register u_wide_int num, register int nbits, char format, char *buf_end, register size_t *len) /* {{{ */
474+
PHPAPI char * ap_php_conv_p2(register uint64_t num, register int nbits, char format, char *buf_end, register size_t *len) /* {{{ */
475475
{
476476
register int mask = (1 << nbits) - 1;
477477
register char *p = buf_end;
@@ -588,7 +588,7 @@ static size_t format_converter(register buffy * odp, const char *fmt, va_list ap
588588

589589
double fp_num;
590590
wide_int i_num = (wide_int) 0;
591-
u_wide_int ui_num;
591+
uint64_t ui_num;
592592

593593
char num_buf[NUM_BUF_SIZE];
594594
char char_buf[2]; /* for printing %% and %<unknown> */
@@ -788,7 +788,7 @@ static size_t format_converter(register buffy * odp, const char *fmt, va_list ap
788788
break;
789789
#if SIZEOF_LONG_LONG
790790
case LM_LONG_LONG:
791-
i_num = (wide_int) va_arg(ap, u_wide_int);
791+
i_num = (wide_int) va_arg(ap, unsigned long long int);
792792
break;
793793
#endif
794794
#if SIZEOF_INTMAX_T
@@ -865,29 +865,29 @@ static size_t format_converter(register buffy * odp, const char *fmt, va_list ap
865865
case 'o':
866866
switch(modifier) {
867867
default:
868-
ui_num = (u_wide_int) va_arg(ap, unsigned int);
868+
ui_num = (uint64_t) va_arg(ap, unsigned int);
869869
break;
870870
case LM_LONG_DOUBLE:
871871
goto fmt_error;
872872
case LM_LONG:
873-
ui_num = (u_wide_int) va_arg(ap, unsigned long int);
873+
ui_num = (uint64_t) va_arg(ap, unsigned long int);
874874
break;
875875
case LM_SIZE_T:
876-
ui_num = (u_wide_int) va_arg(ap, size_t);
876+
ui_num = (uint64_t) va_arg(ap, size_t);
877877
break;
878878
#if SIZEOF_LONG_LONG
879879
case LM_LONG_LONG:
880-
ui_num = (u_wide_int) va_arg(ap, u_wide_int);
880+
ui_num = (uint64_t) va_arg(ap, unsigned long long int);
881881
break;
882882
#endif
883883
#if SIZEOF_INTMAX_T
884884
case LM_INTMAX_T:
885-
ui_num = (u_wide_int) va_arg(ap, uintmax_t);
885+
ui_num = (uint64_t) va_arg(ap, uintmax_t);
886886
break;
887887
#endif
888888
#if SIZEOF_PTRDIFF_T
889889
case LM_PTRDIFF_T:
890-
ui_num = (u_wide_int) va_arg(ap, ptrdiff_t);
890+
ui_num = (uint64_t) va_arg(ap, ptrdiff_t);
891891
break;
892892
#endif
893893
}
@@ -904,29 +904,29 @@ static size_t format_converter(register buffy * odp, const char *fmt, va_list ap
904904
case 'X':
905905
switch(modifier) {
906906
default:
907-
ui_num = (u_wide_int) va_arg(ap, unsigned int);
907+
ui_num = (uint64_t) va_arg(ap, unsigned int);
908908
break;
909909
case LM_LONG_DOUBLE:
910910
goto fmt_error;
911911
case LM_LONG:
912-
ui_num = (u_wide_int) va_arg(ap, unsigned long int);
912+
ui_num = (uint64_t) va_arg(ap, unsigned long int);
913913
break;
914914
case LM_SIZE_T:
915-
ui_num = (u_wide_int) va_arg(ap, size_t);
915+
ui_num = (uint64_t) va_arg(ap, size_t);
916916
break;
917917
#if SIZEOF_LONG_LONG
918918
case LM_LONG_LONG:
919-
ui_num = (u_wide_int) va_arg(ap, u_wide_int);
919+
ui_num = (uint64_t) va_arg(ap, unsigned long long int);
920920
break;
921921
#endif
922922
#if SIZEOF_INTMAX_T
923923
case LM_INTMAX_T:
924-
ui_num = (u_wide_int) va_arg(ap, uintmax_t);
924+
ui_num = (uint64_t) va_arg(ap, uintmax_t);
925925
break;
926926
#endif
927927
#if SIZEOF_PTRDIFF_T
928928
case LM_PTRDIFF_T:
929-
ui_num = (u_wide_int) va_arg(ap, ptrdiff_t);
929+
ui_num = (uint64_t) va_arg(ap, ptrdiff_t);
930930
break;
931931
#endif
932932
}
@@ -1089,8 +1089,8 @@ static size_t format_converter(register buffy * odp, const char *fmt, va_list ap
10891089
* we print "%p" to indicate that we don't handle "%p".
10901090
*/
10911091
case 'p':
1092-
if (sizeof(char *) <= sizeof(u_wide_int)) {
1093-
ui_num = (u_wide_int)((size_t) va_arg(ap, char *));
1092+
if (sizeof(char *) <= sizeof(uint64_t)) {
1093+
ui_num = (uint64_t)((size_t) va_arg(ap, char *));
10941094
s = ap_php_conv_p2(ui_num, 4, 'x',
10951095
&num_buf[NUM_BUF_SIZE], &s_len);
10961096
if (ui_num != 0) {

‎main/snprintf.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,11 @@ typedef enum {
134134
# define WIDE_INT long
135135
#endif
136136
typedef WIDE_INT wide_int;
137-
typedef unsigned WIDE_INT u_wide_int;
138137

139138
PHPAPI char * ap_php_conv_10(wide_int num, bool is_unsigned,
140139
bool * is_negative, char *buf_end, size_t *len);
141140

142-
PHPAPI char * ap_php_conv_p2(u_wide_int num, int nbits,
141+
PHPAPI char * ap_php_conv_p2(uint64_t num, int nbits,
143142
char format, char *buf_end, size_t *len);
144143

145144
/* The maximum precision that's allowed for float conversion. Does not include

‎main/spprintf.c

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

199199
double fp_num;
200200
wide_int i_num = (wide_int) 0;
201-
u_wide_int ui_num = (u_wide_int) 0;
201+
uint64_t ui_num = (uint64_t) 0;
202202

203203
char num_buf[NUM_BUF_SIZE];
204204
char char_buf[2]; /* for printing %% and %<unknown> */
@@ -395,7 +395,7 @@ static void xbuf_format_converter(void *xbuf, bool is_char, const char *fmt, va_
395395
break;
396396
#if SIZEOF_LONG_LONG
397397
case LM_LONG_LONG:
398-
i_num = (wide_int) va_arg(ap, u_wide_int);
398+
i_num = (wide_int) va_arg(ap, unsigned long long int);
399399
break;
400400
#endif
401401
#if SIZEOF_INTMAX_T
@@ -471,29 +471,29 @@ static void xbuf_format_converter(void *xbuf, bool is_char, const char *fmt, va_
471471
case 'o':
472472
switch(modifier) {
473473
default:
474-
ui_num = (u_wide_int) va_arg(ap, unsigned int);
474+
ui_num = (uint64_t) va_arg(ap, unsigned int);
475475
break;
476476
case LM_LONG_DOUBLE:
477477
goto fmt_error;
478478
case LM_LONG:
479-
ui_num = (u_wide_int) va_arg(ap, unsigned long int);
479+
ui_num = (uint64_t) va_arg(ap, unsigned long int);
480480
break;
481481
case LM_SIZE_T:
482-
ui_num = (u_wide_int) va_arg(ap, size_t);
482+
ui_num = (uint64_t) va_arg(ap, size_t);
483483
break;
484484
#if SIZEOF_LONG_LONG
485485
case LM_LONG_LONG:
486-
ui_num = (u_wide_int) va_arg(ap, u_wide_int);
486+
ui_num = (uint64_t) va_arg(ap, unsigned long long int);
487487
break;
488488
#endif
489489
#if SIZEOF_INTMAX_T
490490
case LM_INTMAX_T:
491-
ui_num = (u_wide_int) va_arg(ap, uintmax_t);
491+
ui_num = (uint64_t) va_arg(ap, uintmax_t);
492492
break;
493493
#endif
494494
#if SIZEOF_PTRDIFF_T
495495
case LM_PTRDIFF_T:
496-
ui_num = (u_wide_int) va_arg(ap, ptrdiff_t);
496+
ui_num = (uint64_t) va_arg(ap, ptrdiff_t);
497497
break;
498498
#endif
499499
}
@@ -511,29 +511,29 @@ static void xbuf_format_converter(void *xbuf, bool is_char, const char *fmt, va_
511511
case 'X':
512512
switch(modifier) {
513513
default:
514-
ui_num = (u_wide_int) va_arg(ap, unsigned int);
514+
ui_num = (uint64_t) va_arg(ap, unsigned int);
515515
break;
516516
case LM_LONG_DOUBLE:
517517
goto fmt_error;
518518
case LM_LONG:
519-
ui_num = (u_wide_int) va_arg(ap, unsigned long int);
519+
ui_num = (uint64_t) va_arg(ap, unsigned long int);
520520
break;
521521
case LM_SIZE_T:
522-
ui_num = (u_wide_int) va_arg(ap, size_t);
522+
ui_num = (uint64_t) va_arg(ap, size_t);
523523
break;
524524
#if SIZEOF_LONG_LONG
525525
case LM_LONG_LONG:
526-
ui_num = (u_wide_int) va_arg(ap, u_wide_int);
526+
ui_num = (uint64_t) va_arg(ap, unsigned long long int);
527527
break;
528528
#endif
529529
#if SIZEOF_INTMAX_T
530530
case LM_INTMAX_T:
531-
ui_num = (u_wide_int) va_arg(ap, uintmax_t);
531+
ui_num = (uint64_t) va_arg(ap, uintmax_t);
532532
break;
533533
#endif
534534
#if SIZEOF_PTRDIFF_T
535535
case LM_PTRDIFF_T:
536-
ui_num = (u_wide_int) va_arg(ap, ptrdiff_t);
536+
ui_num = (uint64_t) va_arg(ap, ptrdiff_t);
537537
break;
538538
#endif
539539
}
@@ -695,8 +695,8 @@ static void xbuf_format_converter(void *xbuf, bool is_char, const char *fmt, va_
695695
* we print "%p" to indicate that we don't handle "%p".
696696
*/
697697
case 'p':
698-
if (sizeof(char *) <= sizeof(u_wide_int)) {
699-
ui_num = (u_wide_int)((size_t) va_arg(ap, char *));
698+
if (sizeof(char *) <= sizeof(uint64_t)) {
699+
ui_num = (uint64_t)((size_t) va_arg(ap, char *));
700700
s = ap_php_conv_p2(ui_num, 4, 'x',
701701
&num_buf[NUM_BUF_SIZE], &s_len);
702702
if (ui_num != 0) {

0 commit comments

Comments
 (0)