Skip to content

Commit 82c36cf

Browse files
committed
fix datatype mismatches
1 parent 73ecac8 commit 82c36cf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

main/mergesort.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const voi
104104
*/
105105
PHPAPI int php_mergesort(void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC)
106106
{
107-
register unsigned int i;
107+
register size_t i;
108108
register int sense;
109109
int big, iflag;
110110
register u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
@@ -264,8 +264,8 @@ COPY: b = t;
264264
*/
265265
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)
266266
{
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;
269269

270270
size2 = size*2;
271271
if (n <= 5) {
@@ -336,7 +336,7 @@ static void setup(u_char *list1, u_char *list2, size_t n, size_t size, int (*cmp
336336
static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC)
337337
{
338338
u_char *ai, *s, *t, *u, tmp;
339-
int i;
339+
size_t i;
340340

341341
for (ai = a+size; --n >= 1; ai += size)
342342
for (t = ai; t > a; t -= size) {

0 commit comments

Comments
 (0)