cvs: ZendEngine2 / zend_API.h zend_builtin_functions.c zend_language_scanner.l zend_vm_def.h zend_vm_execute.h

dmitry		Thu Jan 24 18:08:07 2008 UTC

  Modified files:              
    /ZendEngine2	zend_API.h zend_builtin_functions.c 
                	zend_language_scanner.l zend_vm_def.h 
                	zend_vm_execute.h 
  Log:
  Fixed compilation warnings
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.295&r2=1.296&diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.295 ZendEngine2/zend_API.h:1.296
--- ZendEngine2/zend_API.h:1.295	Mon Dec 31 07:12:06 2007
+++ ZendEngine2/zend_API.h	Thu Jan 24 18:08:06 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_API.h,v 1.295 2007/12/31 07:12:06 sebastian Exp $ */
+/* $Id: zend_API.h,v 1.296 2008/01/24 18:08:06 dmitry Exp $ */
 
 #ifndef ZEND_API_H
 #define ZEND_API_H
@@ -1790,22 +1790,23 @@
 		Z_TYPE_P(z) = IS_UNICODE;		\
 	}
 
-#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);	\
+		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_TEXT(z, t, duplicate)					\
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.362&r2=1.363&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.362 ZendEngine2/zend_builtin_functions.c:1.363
--- ZendEngine2/zend_builtin_functions.c:1.362	Thu Jan 24 09:44:28 2008
+++ ZendEngine2/zend_builtin_functions.c	Thu Jan 24 18:08:06 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.362 2008/01/24 09:44:28 pollita Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.363 2008/01/24 18:08:06 dmitry Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -1186,7 +1186,8 @@
 	HashPosition pos;
 	UChar *ustr;
 	zstr entry;
-	int len, ustr_len;
+	unsigned int len;
+	int ustr_len;
 
 	if (ZEND_NUM_ARGS() != 0) {
 		ZEND_WRONG_PARAM_COUNT();
@@ -1716,7 +1717,7 @@
 		zend_constant *val;
 		int module_number;
 		zval **modules;
-		const char **module_names;
+		char **module_names;
 		zend_module_entry *module;
 		int i = 1;
 
@@ -1726,7 +1727,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_language_scanner.l?r1=1.175&r2=1.176&diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.175 ZendEngine2/zend_language_scanner.l:1.176
--- ZendEngine2/zend_language_scanner.l:1.175	Mon Jan 21 19:41:41 2008
+++ ZendEngine2/zend_language_scanner.l	Thu Jan 24 18:08:06 2008
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_language_scanner.l,v 1.175 2008/01/21 19:41:41 dmitry Exp $ */
+/* $Id: zend_language_scanner.l,v 1.176 2008/01/24 18:08:06 dmitry Exp $ */
 
 #define yyleng SCNG(yy_leng)
 #define yytext SCNG(yy_text)
@@ -1164,7 +1164,6 @@
 {
 	register UChar *s, *t;
 	UChar *end;
-	UChar32 codepoint = 0;
 
 	if (!zend_copy_scanner_string(zendlval, yytext+1, yyleng-2, IS_UNICODE, SCNG(output_conv) TSRMLS_CC)) {
 		return 0;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.209&r2=1.210&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.209 ZendEngine2/zend_vm_def.h:1.210
--- ZendEngine2/zend_vm_def.h:1.209	Thu Jan 24 09:41:48 2008
+++ ZendEngine2/zend_vm_def.h	Thu Jan 24 18:08:06 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_vm_def.h,v 1.209 2008/01/24 09:41:48 dmitry Exp $ */
+/* $Id: zend_vm_def.h,v 1.210 2008/01/24 18:08:06 dmitry Exp $ */
 
 /* If you change this file, please regenerate the zend_vm_execute.h and
  * zend_vm_opcodes.h files by running:
@@ -4266,7 +4266,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.215&r2=1.216&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.215 ZendEngine2/zend_vm_execute.h:1.216
--- ZendEngine2/zend_vm_execute.h:1.215	Thu Jan 24 09:41:48 2008
+++ ZendEngine2/zend_vm_execute.h	Thu Jan 24 18:08:06 2008
@@ -620,7 +620,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));
 	}
 }