| Marcus Boerger 2005-10-05, 6:55 pm |
| helly Wed Oct 5 14:57:41 2005 EDT
Modified files:
/ZendEngine2 zend_interfaces.c
Log:
- Fix warnings
http://cvs.php.net/diff.php/ZendEng...37&r2=1.38&ty=u
Index: ZendEngine2/zend_interfaces.c
diff -u ZendEngine2/zend_interfaces.c:1.37 ZendEngine2/zend_interfaces.c:1.38
--- ZendEngine2/zend_interfaces.c:1.37 Mon Oct 3 08:34:57 2005
+++ ZendEngine2/zend_interfaces.c Wed Oct 5 14:57:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_interfaces.c,v 1.37 2005/10/03 12:34:57 helly Exp $ */
+/* $Id: zend_interfaces.c,v 1.38 2005/10/05 18:57:40 helly Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -75,7 +75,7 @@
if (!fn_proxy || !*fn_proxy) {
if (zend_hash_find(function_table, function_name, function_name_len+1, (void **) &fcic.function_handler) == FAILURE) {
/* error at c-level */
- zend_error(E_CORE_ERROR, "Couldn't find implementation for method %v%s%s", obj_ce ? obj_ce->name : EMPTY_STR, obj_ce ? "::" : "", function_name);
+ zend_error(E_CORE_ERROR, "Couldn't find implementation for method %v%s%s", obj_ce ? (void*)obj_ce->name : EMPTY_STR, obj_ce ? "::" : "", function_name);
}
if (fn_proxy) {
*fn_proxy = fcic.function_handler;
@@ -92,7 +92,7 @@
if (!obj_ce) {
obj_ce = object_pp ? Z_OBJCE_PP(object_pp) : NULL;
}
- zend_error(E_CORE_ERROR, "Couldn't execute method %v%s%s", obj_ce ? obj_ce->name : EMPTY_STR, obj_ce ? "::" : "", function_name);
+ zend_error(E_CORE_ERROR, "Couldn't execute method %v%s%s", obj_ce ? (void*)obj_ce->name : EMPTY_STR, obj_ce ? "::" : "", function_name);
}
if (!retval_ptr_ptr) {
if (retval) {
@@ -433,7 +433,7 @@
result = SUCCESS;
break;
case IS_UNICODE:
- *buffer = eustrndup(Z_USTRVAL_P(retval), Z_USTRLEN_P(retval));
+ *buffer = (char*)eustrndup(Z_USTRVAL_P(retval), Z_USTRLEN_P(retval));
*buf_len = Z_USTRLEN_P(retval);
result = SUCCESS;
break;
|