From: Anatol Belski <ab@php.net>
Date: Thu, 1 Mar 2018 19:52:09 +0000 (+0100)
Subject: Get rid of casts
X-Git-Tag: php-7.3.0alpha1~273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d679c353c925352175f8344becfa8beaf81d03b;p=php

Get rid of casts
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 398d44cf96..a0ad3b3619 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4183,10 +4183,10 @@ PHP_FUNCTION(putenv)
 #endif
 	}
 
-	pe.key_len = (int)strlen(pe.key);
+	pe.key_len = strlen(pe.key);
 #ifdef PHP_WIN32
 	if (equals) {
-		if ((size_t)pe.key_len < setting_len - 1) {
+		if (pe.key_len < setting_len - 1) {
 			value = p + 1;
 		} else {
 			/* empty string*/
@@ -4353,13 +4353,13 @@ PHP_FUNCTION(getopt)
 	char *options = NULL, **argv = NULL;
 	char opt[2] = { '\0' };
 	char *optname;
-	int argc = 0, len, o;
-	size_t options_len = 0;
+	int argc = 0, o;
+	size_t options_len = 0, len;
 	char *php_optarg = NULL;
 	int php_optind = 1;
 	zval val, *args = NULL, *p_longopts = NULL;
 	zval *zoptind = NULL;
-	int optname_len = 0;
+	size_t optname_len = 0;
 	opt_struct *opts, *orig_opts;
 
 	ZEND_PARSE_PARAMETERS_START(1, 3)
@@ -4435,7 +4435,7 @@ PHP_FUNCTION(getopt)
 
 			opts->need_param = 0;
 			opts->opt_name = estrdup(ZSTR_VAL(arg_str));
-			len = (int)strlen(opts->opt_name);
+			len = strlen(opts->opt_name);
 			if ((len > 0) && (opts->opt_name[len - 1] == ':')) {
 				opts->need_param++;
 				opts->opt_name[len - 1] = '\0';
@@ -4491,7 +4491,7 @@ PHP_FUNCTION(getopt)
 		}
 
 		/* Add this option / argument pair to the result hash. */
-		optname_len = (int)strlen(optname);
+		optname_len = strlen(optname);
 		if (!(optname_len > 1 && optname[0] == '0') && is_numeric_string(optname, optname_len, NULL, NULL, 0) == IS_LONG) {
 			/* numeric string */
 			int optname_int = atoi(optname);
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 7a7252b8e2..073aa017ef 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -250,7 +250,7 @@ typedef struct {
 	char *putenv_string;
 	char *previous_value;
 	char *key;
-	int key_len;
+	size_t key_len;
 } putenv_entry;
 #endif