diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-06-28 11:37:51 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-28 11:37:51 +0300 |
| commit | 0cfb47651c09a4a17c5aa4e9c06f865171cb34f9 (patch) | |
| tree | 0976c25c9144c1aac2ea22e44882fc4119bda00c /Zend | |
| parent | 0ac51448368162efb62c188acb98924f8b05c3e9 (diff) | |
| download | php-git-0cfb47651c09a4a17c5aa4e9c06f865171cb34f9.tar.gz | |
Fixed compilation warnings
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_alloc.c | 2 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 76f1952f93..ed7575d256 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2374,7 +2374,7 @@ ZEND_API void ZEND_FASTCALL _efree_large(void *ptr, size_t size) size_t page_offset = ZEND_MM_ALIGNED_OFFSET(ptr, ZEND_MM_CHUNK_SIZE); zend_mm_chunk *chunk = (zend_mm_chunk*)ZEND_MM_ALIGNED_BASE(ptr, ZEND_MM_CHUNK_SIZE); int page_num = page_offset / ZEND_MM_PAGE_SIZE; - int pages_count = ZEND_MM_ALIGNED_SIZE_EX(size, ZEND_MM_PAGE_SIZE) / ZEND_MM_PAGE_SIZE; + uint32_t pages_count = ZEND_MM_ALIGNED_SIZE_EX(size, ZEND_MM_PAGE_SIZE) / ZEND_MM_PAGE_SIZE; ZEND_MM_CHECK(chunk->heap == AG(mm_heap) && ZEND_MM_ALIGNED_OFFSET(page_offset, ZEND_MM_PAGE_SIZE) == 0, "zend_mm_heap corrupted"); ZEND_ASSERT(chunk->map[page_num] & ZEND_MM_IS_LRUN); diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index b9d8341b52..c84a1f1bcd 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -767,7 +767,7 @@ ZEND_FUNCTION(each) Return the current error_reporting level, and if an argument was passed - change to the new level */ ZEND_FUNCTION(error_reporting) { - zval *err; + zval *err = NULL; int old_error_reporting; #ifndef FAST_ZPP |