com php-src: fix datatype mismatches: main/mergesort.c
| From: | Anatol Belski | Date: | Mon, 27 Oct 2014 15:38:46 +0000 |
| Subject: | com php-src: fix datatype mismatches: main/mergesort.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82716@lists.php.net to get a copy of this message | ||
Commit: 82c36cf5e8f830b79352251eb2785a1133c4aeff
Author: Anatol Belski <ab@php.net> Mon, 27 Oct 2014 12:27:57 +0100
Parents: 73ecac89e181da494816528b0bb9db221fc183ac
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82c36cf5e8f830b79352251eb2785a1133c4aeff
Log:
fix datatype mismatches
Changed paths:
M main/mergesort.c
Diff:
diff --git a/main/mergesort.c b/main/mergesort.c
index 4555e1b..b049e68 100644
--- a/main/mergesort.c
+++ b/main/mergesort.c
@@ -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)
{
- register unsigned int i;
+ register size_t i;
register int sense;
int big, iflag;
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)
{
- int i, length, size2, tmp, sense;
- u_char *f1, *f2, *s, *l2, *last, *p2;
+ size_t i, length, size2, sense;
+ u_char *f1, *f2, *s, *l2, *last, *p2, tmp;
size2 = size*2;
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)
{
u_char *ai, *s, *t, *u, tmp;
- int i;
+ size_t i;
for (ai = a+size; --n >= 1; ai += size)
for (t = ai; t > a; t -= size) {