cvs: ZendEngine2 / zend_alloc.c

tony2001 Mon May 28 10:07:35 2007 UTC Modified files: /ZendEngine2 zend_alloc.c Log: use unsigned modifiers http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.200&r2=1.201&diff_format=u Index: ZendEngine2/zend_alloc.c diff -u ZendEngine2/zend_alloc.c:1.200 ZendEngine2/zend_alloc.c:1.201 --- ZendEngine2/zend_alloc.c:1.200 Mon Apr 16 09:43:52 2007 +++ ZendEngine2/zend_alloc.c Mon May 28 10:07:35 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.c,v 1.200 2007/04/16 09:43:52 dmitry Exp $ */ +/* $Id: zend_alloc.c,v 1.201 2007/05/28 10:07:35 tony2001 Exp $ */ #include "zend.h" #include "zend_alloc.h" @@ -1794,9 +1794,9 @@ #endif HANDLE_UNBLOCK_INTERRUPTIONS(); #if ZEND_DEBUG - zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted at %s:%d (tried to allocate %ld bytes)", heap->limit, __zend_filename, __zend_lineno, size); + zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted at %s:%d (tried to allocate %lu bytes)", heap->limit, __zend_filename, __zend_lineno, size); #else - zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted (tried to allocate %ld bytes)", heap->limit, size); + zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted (tried to allocate %lu bytes)", heap->limit, size); #endif } @@ -1810,9 +1810,9 @@ HANDLE_UNBLOCK_INTERRUPTIONS(); out_of_memory: #if ZEND_DEBUG - zend_mm_safe_error(heap, "Out of memory (allocated %ld) at %s:%d (tried to allocate %ld bytes)", heap->real_size, __zend_filename, __zend_lineno, size); + zend_mm_safe_error(heap, "Out of memory (allocated %ld) at %s:%d (tried to allocate %lu bytes)", heap->real_size, __zend_filename, __zend_lineno, size); #else - zend_mm_safe_error(heap, "Out of memory (allocated %ld) (tried to allocate %ld bytes)", heap->real_size, size); + zend_mm_safe_error(heap, "Out of memory (allocated %ld) (tried to allocate %lu bytes)", heap->real_size, size); #endif return NULL; } @@ -2283,7 +2283,7 @@ "rm"(offset)); if (UNEXPECTED(overflow)) { - zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zd * %zd + %zd)", nmemb, size, offset); + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); return 0; } return res; @@ -2298,7 +2298,7 @@ double _delta = (double)res - _d; if (UNEXPECTED((_d + _delta ) != _d)) { - zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zd * %zd + %zd)", nmemb, size, offset); + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); return 0; } return res;