mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 04:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix datatype mismatches

Browse Source
This commit is contained in:
Anatol Belski 2014-10-27 12:27:57 +01:00
parent 73ecac89e1
commit 82c36cf5e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/mergesort.c
View File

@ -104,7 +104,7 @@ static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const voi
*/ */
PHPAPI int php_mergesort(void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC) PHPAPI int php_mergesort(void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC)
{ {
register unsigned int i; register size_t i;
register int sense; register int sense;
int big, iflag; int big, iflag;
register u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2; register u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
@ -264,8 +264,8 @@ COPY: b = t;
*/ */
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) 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)
{ {
int i, length, size2, tmp, sense; size_t i, length, size2, sense;
u_char *f1, *f2, *s, *l2, *last, *p2; u_char *f1, *f2, *s, *l2, *last, *p2, tmp;
size2 = size*2; size2 = size*2;
if (n <= 5) { if (n <= 5) {
@ -336,7 +336,7 @@ static void setup(u_char *list1, u_char *list2, size_t n, size_t size, int (*cmp
static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC) static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC)
{ {
u_char *ai, *s, *t, *u, tmp; u_char *ai, *s, *t, *u, tmp;
int i; size_t i;
for (ai = a+size; --n >= 1; ai += size) for (ai = a+size; --n >= 1; ai += size)
for (t = ai; t > a; t -= size) { for (t = ai; t > a; t -= size) {