cvs: ZendEngine2(PHP_5_3) / zend_API.h zend_builtin_functions.c zend_interfaces.c zend_vm_def.h zend_vm_execute.h
[email protected] ("Dmitry Stogov")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsdmitry1201198068@cvsserver> |
dmitry Thu Jan 24 18:07:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_API.h zend_builtin_functions.c zend_interfaces.c
zend_vm_def.h zend_vm_execute.h
Log:
Fixed comilation warnings
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.207.2.8.2.8.2.6&r2=1.207.2.8.2.8.2.7&diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.207.2.8.2.8.2.6 ZendEngine2/zend_API.h:1.207.2.8.2.8.2.7
--- ZendEngine2/zend_API.h:1.207.2.8.2.8.2.6 Mon Dec 31 07:17:04 2007
+++ ZendEngine2/zend_API.h Thu Jan 24 18:07:45 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.h,v 1.207.2.8.2.8.2.6 2007/12/31 07:17:04 sebastian Exp $ */
+/* $Id: zend_API.h,v 1.207.2.8.2.8.2.7 2008/01/24 18:07:45 dmitry Exp $ */
#ifndef ZEND_API_H
#define ZEND_API_H
@@ -522,22 +522,21 @@
Z_TYPE_P(z) = IS_STRING; \
}
-#define ZVAL_ZVAL(z, zv, copy, dtor) { \
- int is_ref, refcount; \
- is_ref = Z_ISREF_P(z); \
- refcount = Z_REFCOUNT_P(z); \
- *(z) = *(zv); \
- if (copy) { \
- zval_copy_ctor(z); \
- } \
- if (dtor) { \
- if (!copy) { \
- ZVAL_NULL(zv); \
- } \
- zval_ptr_dtor(&zv); \
- } \
- Z_SET_ISREF_TO_P(z, is_ref); \
- Z_SET_REFCOUNT_P(z, refcount); \
+#define ZVAL_ZVAL(z, zv, copy, dtor) { \
+ zend_uchar is_ref = Z_ISREF_P(z); \
+ zend_uint refcount = Z_REFCOUNT_P(z); \
+ *(z) = *(zv); \
+ if (copy) { \
+ zval_copy_ctor(z); \
+ } \
+ if (dtor) { \
+ if (!copy) { \
+ ZVAL_NULL(zv); \
+ } \
+ zval_ptr_dtor(&zv); \
+ } \
+ Z_SET_ISREF_TO_P(z, is_ref); \
+ Z_SET_REFCOUNT_P(z, refcount); \
}
#define ZVAL_FALSE(z) ZVAL_BOOL(z, 0)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.9&r2=1.277.2.12.2.25.2.10&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.9 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.10
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.9 Thu Jan 24 09:41:37 2008
+++ ZendEngine2/zend_builtin_functions.c Thu Jan 24 18:07:45 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.9 2008/01/24 09:41:37 dmitry Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.10 2008/01/24 18:07:45 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -1654,7 +1654,7 @@
zend_constant *val;
int module_number;
zval **modules;
- const char **module_names;
+ char **module_names;
zend_module_entry *module;
int i = 1;
@@ -1664,7 +1664,7 @@
module_names[0] = "internal";
zend_hash_internal_pointer_reset_ex(&module_registry, &pos);
while (zend_hash_get_current_data_ex(&module_registry, (void *) &module, &pos) != FAILURE) {
- module_names[i++] = module->name;
+ module_names[i++] = (char*)module->name;
zend_hash_move_forward_ex(&module_registry, &pos);
}
module_names[i] = "user";
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_interfaces.c?r1=1.33.2.4.2.6.2.3&r2=1.33.2.4.2.6.2.4&diff_format=u
Index: ZendEngine2/zend_interfaces.c
diff -u ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.3 ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.4
--- ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.3 Mon Dec 31 07:17:04 2007
+++ ZendEngine2/zend_interfaces.c Thu Jan 24 18:07:45 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.3 2007/12/31 07:17:04 sebastian Exp $ */
+/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.4 2008/01/24 18:07:45 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -422,7 +422,7 @@
zval_ptr_dtor(&retval);
return FAILURE;
case IS_STRING:
- *buffer = estrndup(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ *buffer = (unsigned char*)estrndup(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
*buf_len = Z_STRLEN_P(retval);
result = SUCCESS;
break;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.48.2.32&r2=1.59.2.29.2.48.2.33&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.32 ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.33
--- ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.32 Thu Jan 24 09:41:37 2008
+++ ZendEngine2/zend_vm_def.h Thu Jan 24 18:07:45 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.32 2008/01/24 09:41:37 dmitry Exp $ */
+/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.33 2008/01/24 18:07:45 dmitry Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -4099,7 +4099,7 @@
case ZEND_USER_OPCODE_DISPATCH:
ZEND_VM_DISPATCH(EX(opline)->opcode, EX(opline));
default:
- ZEND_VM_DISPATCH(ret & 0xff, EX(opline));
+ ZEND_VM_DISPATCH((zend_uchar)(ret & 0xff), EX(opline));
}
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.49.2.33&r2=1.62.2.30.2.49.2.34&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.33 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.34
--- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.33 Thu Jan 24 09:41:37 2008
+++ ZendEngine2/zend_vm_execute.h Thu Jan 24 18:07:45 2008
@@ -612,7 +612,7 @@
case ZEND_USER_OPCODE_DISPATCH:
ZEND_VM_DISPATCH(EX(opline)->opcode, EX(opline));
default:
- ZEND_VM_DISPATCH(ret & 0xff, EX(opline));
+ ZEND_VM_DISPATCH((zend_uchar)(ret & 0xff), EX(opline));
}
}