@@ -106,6 +106,8 @@ typedef struct CharSet {
106
106
} * ranges ;
107
107
} CharSet ;
108
108
109
+ typedef zend_long (* int_string_formater )(const char * , char * * , int );
110
+
109
111
/*
110
112
* Declarations for functions used only in this file.
111
113
*/
@@ -583,7 +585,7 @@ PHPAPI int php_sscanf_internal( char *string, char *format,
583
585
int base = 0 ;
584
586
int underflow = 0 ;
585
587
size_t width ;
586
- zend_long ( * fn )( const char * , char * * , int ) = NULL ;
588
+ int_string_formater fn = NULL ;
587
589
char * ch , sch ;
588
590
int flags ;
589
591
char buf [64 ]; /* Temporary buffer to hold scanned number
@@ -740,29 +742,29 @@ PHPAPI int php_sscanf_internal( char *string, char *format,
740
742
case 'D' :
741
743
op = 'i' ;
742
744
base = 10 ;
743
- fn = (zend_long ( * )( const char * , char * * , int ) )ZEND_STRTOL_PTR ;
745
+ fn = (int_string_formater )ZEND_STRTOL_PTR ;
744
746
break ;
745
747
case 'i' :
746
748
op = 'i' ;
747
749
base = 0 ;
748
- fn = (zend_long ( * )( const char * , char * * , int ) )ZEND_STRTOL_PTR ;
750
+ fn = (int_string_formater )ZEND_STRTOL_PTR ;
749
751
break ;
750
752
case 'o' :
751
753
op = 'i' ;
752
754
base = 8 ;
753
- fn = (zend_long ( * )( const char * , char * * , int ) )ZEND_STRTOL_PTR ;
755
+ fn = (int_string_formater )ZEND_STRTOL_PTR ;
754
756
break ;
755
757
case 'x' :
756
758
case 'X' :
757
759
op = 'i' ;
758
760
base = 16 ;
759
- fn = (zend_long ( * )( const char * , char * * , int ) )ZEND_STRTOL_PTR ;
761
+ fn = (int_string_formater )ZEND_STRTOL_PTR ;
760
762
break ;
761
763
case 'u' :
762
764
op = 'i' ;
763
765
base = 10 ;
764
766
flags |= SCAN_UNSIGNED ;
765
- fn = (zend_long ( * )( const char * , char * * , int ) )ZEND_STRTOUL_PTR ;
767
+ fn = (int_string_formater )ZEND_STRTOUL_PTR ;
766
768
break ;
767
769
768
770
case 'f' :
0 commit comments