com php-src: fix datatype mismatches: Zend/zend_llist.c Z end/zend_llist.h main/streams/streams.c
| From: | Anatol Belski | Date: | Mon, 27 Oct 2014 15:38:40 +0000 |
| Subject: | com php-src: fix datatype mismatches: Zend/zend_llist.c Z end/zend_llist.h main/streams/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82720@lists.php.net to get a copy of this message | ||
Commit: b0d86d87d829a986ce2dd226e410e7f010702c6a
Author: Anatol Belski <ab@php.net> Mon, 27 Oct 2014 12:00:25 +0100
Parents: 5b5e2d3d456b6ca7d7a0ba2af074b153d84fe997
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b0d86d87d829a986ce2dd226e410e7f010702c6a
Log:
fix datatype mismatches
Changed paths:
M Zend/zend_llist.c
M Zend/zend_llist.h
M main/streams/streams.c
Diff:
diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index 0fb49ab..0df7e70 100644
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -243,7 +243,7 @@ ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_ar
}
-ZEND_API int zend_llist_count(zend_llist *l)
+ZEND_API size_t zend_llist_count(zend_llist *l)
{
return l->count;
}
diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index 602884c..ffe0c3c 100644
--- a/Zend/zend_llist.h
+++ b/Zend/zend_llist.h
@@ -59,7 +59,7 @@ ZEND_API void zend_llist_apply(zend_llist *l, llist_apply_func_t func TSRMLS_DC)
ZEND_API void zend_llist_apply_with_del(zend_llist *l, int (*func)(void *data));
ZEND_API void zend_llist_apply_with_argument(zend_llist *l, llist_apply_with_arg_func_t func, void
*arg TSRMLS_DC);
ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_args_func_t func
TSRMLS_DC, int num_args, ...);
-ZEND_API int zend_llist_count(zend_llist *l);
+ZEND_API size_t zend_llist_count(zend_llist *l);
ZEND_API void zend_llist_sort(zend_llist *l, llist_compare_func_t comp_func TSRMLS_DC);
/* traversal */
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 6be2b91..e49eb17 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -177,7 +177,7 @@ void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *
size_t l = 0;
int brlen;
int i;
- int count = zend_llist_count(err_list);
+ int count = (int)zend_llist_count(err_list);
const char *br;
const char **err_buf_p;
zend_llist_position pos;