@@ -104,7 +104,7 @@ static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const voi
104
104
*/
105
105
PHPAPI int php_mergesort (void * base , size_t nmemb , size_t size , int (* cmp )(const void * , const void * TSRMLS_DC ) TSRMLS_DC )
106
106
{
107
- register unsigned int i ;
107
+ register size_t i ;
108
108
register int sense ;
109
109
int big , iflag ;
110
110
register u_char * f1 , * f2 , * t , * b , * tp2 , * q , * l1 , * l2 ;
@@ -264,8 +264,8 @@ COPY: b = t;
264
264
*/
265
265
static void setup (u_char * list1 , u_char * list2 , size_t n , size_t size , int (* cmp )(const void * , const void * TSRMLS_DC ) TSRMLS_DC )
266
266
{
267
- int i , length , size2 , tmp , sense ;
268
- u_char * f1 , * f2 , * s , * l2 , * last , * p2 ;
267
+ size_t i , length , size2 , sense ;
268
+ u_char * f1 , * f2 , * s , * l2 , * last , * p2 , tmp ;
269
269
270
270
size2 = size * 2 ;
271
271
if (n <= 5 ) {
@@ -336,7 +336,7 @@ static void setup(u_char *list1, u_char *list2, size_t n, size_t size, int (*cmp
336
336
static void insertionsort (u_char * a , size_t n , size_t size , int (* cmp )(const void * , const void * TSRMLS_DC ) TSRMLS_DC )
337
337
{
338
338
u_char * ai , * s , * t , * u , tmp ;
339
- int i ;
339
+ size_t i ;
340
340
341
341
for (ai = a + size ; -- n >= 1 ; ai += size )
342
342
for (t = ai ; t > a ; t -= size ) {
0 commit comments