diff options
author | Anatol Belski <ab@php.net> | 2014-10-27 12:00:25 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-10-27 16:38:40 +0100 |
commit | b0d86d87d829a986ce2dd226e410e7f010702c6a (patch) | |
tree | f64e12395c984626e14f0cbf2ab8d097203f3922 | |
parent | 5b5e2d3d456b6ca7d7a0ba2af074b153d84fe997 (diff) | |
download | php-git-b0d86d87d829a986ce2dd226e410e7f010702c6a.tar.gz |
fix datatype mismatches
-rw-r--r-- | Zend/zend_llist.c | 2 | ||||
-rw-r--r-- | Zend/zend_llist.h | 2 | ||||
-rw-r--r-- | main/streams/streams.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c index 0fb49abf5b..0df7e702f1 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 602884c27d..ffe0c3cf99 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 6be2b91dc7..e49eb1712e 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; |