cvs: ZendEngine2(PHP_5_2) / zend_alloc.c
| From: | Antony Dovgal | Date: | Mon, 28 May 2007 10:07:50 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend_alloc.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5819@lists.php.net to get a copy of this message | ||
tony2001 Mon May 28 10:07:50 2007 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_alloc.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.144.2.3.2.41&r2=1.144.2.3.2.42&diff_format=u
Index: ZendEngine2/zend_alloc.c
diff -u ZendEngine2/zend_alloc.c:1.144.2.3.2.41 ZendEngine2/zend_alloc.c:1.144.2.3.2.42
--- ZendEngine2/zend_alloc.c:1.144.2.3.2.41 Mon Apr 16 08:09:54 2007
+++ ZendEngine2/zend_alloc.c Mon May 28 10:07:50 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.c,v 1.144.2.3.2.41 2007/04/16 08:09:54 dmitry Exp $ */
+/* $Id: zend_alloc.c,v 1.144.2.3.2.42 2007/05/28 10:07:50 tony2001 Exp $ */
#include "zend.h"
#include "zend_alloc.h"
@@ -1796,9 +1796,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
}
@@ -1812,9 +1812,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;
}
@@ -2286,7 +2286,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;
@@ -2301,7 +2301,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;