Reverted because correct decision has not been made yet.

8 files changed, 24 insertions, 24 deletions

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 2f1740e281..791b215d2f 100644
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -605,7 +605,7 @@ PHPAPI PHP_FUNCTION(sql_regcase)
 	
 	tmp = emalloc((Z_STRLEN_PP(string) * 4) + 1);
 	
-	for (i = j = 0; i < (int)Z_STRLEN_PP(string); i++) {
+	for (i = j = 0; i < Z_STRLEN_PP(string); i++) {
 		c = (unsigned char) Z_STRVAL_PP(string)[i];
 		if(isalpha(c)) {
 			tmp[j++] = '[';
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 8118095b84..b2d50d5032 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -49,20 +49,20 @@ static void convert_browscap_pattern(zval *pattern)
 	register int i, j;
 	char *t;
 
-	for (i = 0; i < (int)Z_STRLEN_P(pattern); i++) {
+	for (i=0; i<Z_STRLEN_P(pattern); i++) {
 		if (Z_STRVAL_P(pattern)[i]=='*' || Z_STRVAL_P(pattern)[i]=='?' || Z_STRVAL_P(pattern)[i]=='.') {
 			break;
 		}
 	}
 
-	if (i == (int)Z_STRLEN_P(pattern)) { /* no wildcards */
+	if (i==Z_STRLEN_P(pattern)) { /* no wildcards */
 		Z_STRVAL_P(pattern) = zend_strndup(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern));
 		return;
 	}
 
 	t = (char *) malloc(Z_STRLEN_P(pattern)*2 + 1);
 	
-	for (i = 0, j = 0; i < (int)Z_STRLEN_P(pattern); i++, j++) {
+	for (i=0, j=0; i<Z_STRLEN_P(pattern); i++, j++) {
 		switch (Z_STRVAL_P(pattern)[i]) {
 			case '?':
 				t[j] = '.';
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 23afd47f1b..260271590b 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -313,7 +313,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected error");
 		RETURN_FALSE;
 	}
-	for (i = 0; i < (int)Z_STRLEN_PP(format); i++) {
+	for (i = 0; i < Z_STRLEN_PP(format); i++) {
 		switch (Z_STRVAL_PP(format)[i]) {
 			case 'r':		/* rfc822 format */
 				size += 31;
@@ -366,7 +366,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
 				size += 2;
 				break;
 			case '\\':
-				if(i < ((int)Z_STRLEN_PP(format)) - 1) {
+				if(i < Z_STRLEN_PP(format)-1) {
 					i++;
 				}
 				size ++;
@@ -383,10 +383,10 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
 	Z_STRVAL_P(return_value) = (char *) emalloc(size + 1);
 	Z_STRVAL_P(return_value)[0] = '\0';
 
-	for (i = 0; i < (int)Z_STRLEN_PP(format); i++) {
+	for (i = 0; i < Z_STRLEN_PP(format); i++) {
 		switch (Z_STRVAL_PP(format)[i]) {
 			case '\\':
-				if(i < (int)(Z_STRLEN_PP(format)) - 1) {
+				if(i < Z_STRLEN_PP(format)-1) {
 					char ch[2];
 					ch[0]=Z_STRVAL_PP(format)[i+1];
 					ch[1]='\0';
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 38fdec6413..d6fc9d9543 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1376,7 +1376,7 @@ PHPAPI PHP_FUNCTION(fgets)
 		ZVAL_STRINGL(return_value, buf, line_len, 0);
 		/* resize buffer if it's much larger than the result.
 		 * Only needed if the user requested a buffer size. */
-		if (argc > 1 && (int)Z_STRLEN_P(return_value) < len / 2) {
+		if (argc > 1 && Z_STRLEN_P(return_value) < len / 2) {
 			Z_STRVAL_P(return_value) = erealloc(buf, line_len + 1);
 		}
 	}
@@ -1559,7 +1559,7 @@ PHPAPI PHP_FUNCTION(fwrite)
 		}
 		convert_to_string_ex(arg2);
 		convert_to_long_ex(arg3);
-		num_bytes = MIN(Z_LVAL_PP(arg3), (int)Z_STRLEN_PP(arg2));
+		num_bytes = MIN(Z_LVAL_PP(arg3), Z_STRLEN_PP(arg2));
 		break;
 	default:
 		WRONG_PARAM_COUNT;
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 47cc471608..d5bd95c4b7 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -504,7 +504,7 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC
 
 	currarg = 1;
 
-	while (inpos < (int)Z_STRLEN_PP(args[format_offset])) {
+	while (inpos<Z_STRLEN_PP(args[format_offset])) {
 		int expprec = 0;
 
 		PRINTF_DEBUG(("sprintf: format[%d]='%c'\n", inpos, format[inpos]));
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 56919f71fe..0002aaeb37 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -320,7 +320,7 @@ PHP_FUNCTION(pack)
 				val = argv[currentarg++];
 				convert_to_string_ex(val);
 				memcpy(&output[outputpos], Z_STRVAL_PP(val),
-					   ((int)Z_STRLEN_PP(val) < arg) ? Z_STRLEN_PP(val) : arg);
+					   (Z_STRLEN_PP(val) < arg) ? Z_STRLEN_PP(val) : arg);
 				outputpos += arg;
 				break;
 
@@ -334,7 +334,7 @@ PHP_FUNCTION(pack)
 				convert_to_string_ex(val);
 				v = Z_STRVAL_PP(val);
 				outputpos--;
-				if(arg > (int)Z_STRLEN_PP(val)) {
+				if(arg > Z_STRLEN_PP(val)) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Type %c: not enough characters in string", code);
 					arg = Z_STRLEN_PP(val);
 				}
diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 2f1740e281..791b215d2f 100644
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -605,7 +605,7 @@ PHPAPI PHP_FUNCTION(sql_regcase)
 	
 	tmp = emalloc((Z_STRLEN_PP(string) * 4) + 1);
 	
-	for (i = j = 0; i < (int)Z_STRLEN_PP(string); i++) {
+	for (i = j = 0; i < Z_STRLEN_PP(string); i++) {
 		c = (unsigned char) Z_STRVAL_PP(string)[i];
 		if(isalpha(c)) {
 			tmp[j++] = '[';
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 5b87657566..65b995de86 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1557,7 +1557,7 @@ PHP_FUNCTION(strrpos)
 
 	if (argc == 3) {
 		convert_to_long_ex(offset);
-		if (Z_LVAL_PP(offset) < 0 || Z_LVAL_PP(offset) > (int)Z_STRLEN_PP(haystack)) {
+		if (Z_LVAL_PP(offset) < 0 || Z_LVAL_PP(offset) > Z_STRLEN_PP(haystack)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string.");
 			RETURN_FALSE;
 		}
@@ -1597,7 +1597,7 @@ PHP_FUNCTION(strripos)
 
 	if (argc == 3) {
 		convert_to_long_ex(offset);
-		if (Z_LVAL_PP(offset) < 0 || Z_LVAL_PP(offset) > (int)Z_STRLEN_PP(haystack)) {
+		if (Z_LVAL_PP(offset) < 0 || Z_LVAL_PP(offset) > Z_STRLEN_PP(haystack)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string.");
 			RETURN_FALSE;
 		}
@@ -1786,11 +1786,11 @@ PHP_FUNCTION(substr)
 		}
 	}
 
-	if (f >= (int)Z_STRLEN_PP(str)) {
+	if (f >= Z_STRLEN_PP(str)) {
 		RETURN_FALSE;
 	}
 
-	if ((f + l) > (int)Z_STRLEN_PP(str)) {
+	if ((f + l) > Z_STRLEN_PP(str)) {
 		l = Z_STRLEN_PP(str) - f;
 	}
 
@@ -1833,11 +1833,11 @@ PHP_FUNCTION(substr_replace)
 	 * of the string
 	 */
 	if (f < 0) {
-		f = (int)Z_STRLEN_PP(str) + f;
+		f = Z_STRLEN_PP(str) + f;
 		if (f < 0) {
 			f = 0;
 		}
-	} else if (f > (int)Z_STRLEN_PP(str)) {
+	} else if (f > Z_STRLEN_PP(str)) {
 		f = Z_STRLEN_PP(str);
 	}
 
@@ -1852,7 +1852,7 @@ PHP_FUNCTION(substr_replace)
 		}
 	}
 
-	if ((f + l) > (int)Z_STRLEN_PP(str)) {
+	if ((f + l) > Z_STRLEN_PP(str)) {
 		l = Z_STRLEN_PP(str) - f;
 	}
 
@@ -3014,7 +3014,7 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS, int convert_newlines)
 	
 	do {
 		if (block_type == _HEB_BLOCK_TYPE_HEB) {
-			while ((isheb((int)*(tmp+1)) || _isblank((int)*(tmp+1)) || ispunct((int)*(tmp+1)) || (int)*(tmp+1)=='\n' ) && block_end<((int)Z_STRLEN_PP(str))-1) {
+			while ((isheb((int)*(tmp+1)) || _isblank((int)*(tmp+1)) || ispunct((int)*(tmp+1)) || (int)*(tmp+1)=='\n' ) && block_end<Z_STRLEN_PP(str)-1) {
 				tmp++;
 				block_end++;
 				block_length++;
@@ -3059,7 +3059,7 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS, int convert_newlines)
 			}
 			block_type = _HEB_BLOCK_TYPE_ENG;
 		} else {
-			while (!isheb(*(tmp+1)) && (int)*(tmp+1)!='\n' && block_end < ((int)Z_STRLEN_PP(str))-1) {
+			while (!isheb(*(tmp+1)) && (int)*(tmp+1)!='\n' && block_end < Z_STRLEN_PP(str)-1) {
 				tmp++;
 				block_end++;
 				block_length++;
@@ -3075,7 +3075,7 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS, int convert_newlines)
 			block_type = _HEB_BLOCK_TYPE_HEB;
 		}
 		block_start=block_end+1;
-	} while (block_end < ((int)Z_STRLEN_PP(str))-1);
+	} while (block_end < Z_STRLEN_PP(str)-1);
 
 
 	broken_str = (char *) emalloc(Z_STRLEN_PP(str)+1);