From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 24 Jan 2008 18:08:06 +0000 (+0000)
Subject: Fixed compilation warnings
X-Git-Tag: RELEASE_2_0_0a1~790
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=306369985b344c24a6490c0b7f1b6fe19907cbcf;p=php

Fixed compilation warnings
---

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index fd3ffdf84f..7aa24150a2 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1790,22 +1790,23 @@ END_EXTERN_C()
 		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)					\
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index ad8148d2b6..4bd34850f7 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1186,7 +1186,8 @@ ZEND_FUNCTION(get_included_files)
 	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_FUNCTION(get_defined_constants)
 		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 @@ ZEND_FUNCTION(get_defined_constants)
 		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";
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 0c28efd6aa..8586759546 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1164,7 +1164,6 @@ static int zend_scan_unicode_single_string(zval *zendlval TSRMLS_DC)
 {
 	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;
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 7c91bdcd49..e2f8e853c1 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4266,7 +4266,7 @@ ZEND_VM_HANDLER(150, ZEND_USER_OPCODE, ANY, ANY)
 		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));
 	}
 }
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 50c76ef1c3..76df481e72 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -620,7 +620,7 @@ static int ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		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));
 	}
 }