diff options
| author | Anatol Belski <ab@php.net> | 2014-10-13 19:02:22 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-13 19:02:22 +0200 |
| commit | 766eb0103fe8f59c00ddadc5c5767093ee35b2e8 (patch) | |
| tree | f11b01c33784791330f5f524faed6dab9c04766b /sapi/cli/php_cli.c | |
| parent | 19c41e1f538e854fa8450715791c44f55e909588 (diff) | |
| parent | 65eb8ef8d040976e81b5f7b11e74013218cd1428 (diff) | |
| download | php-git-766eb0103fe8f59c00ddadc5c5767093ee35b2e8.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix several datatype mismatch warnings
fix signed/unsigned mismatch warning
more signed/unsigned mismatch fix
fix signed/unsigned mismatch warning
fix signed/unsigned mismatch
fix some signed/unsigned mismatch
missing include for strlen proto
More fixes for array/object casts with temporary variables
Fix array/object cast of refcounted tmp var
Deref right value for compound assign ops
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 19e56284e3..7513b72504 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -244,7 +244,7 @@ static inline int sapi_cli_select(int fd TSRMLS_DC) PHP_SAFE_FD_SET(fd, &wfd); - tv.tv_sec = FG(default_socket_timeout); + tv.tv_sec = (long)FG(default_socket_timeout); tv.tv_usec = 0; ret = php_select(fd+1, &dfd, &wfd, &dfd, &tv); @@ -1120,7 +1120,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */ } case PHP_MODE_REFLECTION_EXT_INFO: { - int len = strlen(reflection_what); + int len = (int)strlen(reflection_what); char *lcname = zend_str_tolower_dup(reflection_what, len); zend_module_entry *module; @@ -1258,7 +1258,7 @@ int main(int argc, char *argv[]) break; case 'd': { /* define ini entries on command line */ - int len = strlen(php_optarg); + int len = (int)strlen(php_optarg); char *val; if ((val = strchr(php_optarg, '='))) { @@ -1266,11 +1266,11 @@ int main(int argc, char *argv[]) if (!isalnum(*val) && *val != '"' && *val != '\'' && *val != '\0') { ini_entries = realloc(ini_entries, ini_entries_len + len + sizeof("\"\"\n\0")); memcpy(ini_entries + ini_entries_len, php_optarg, (val - php_optarg)); - ini_entries_len += (val - php_optarg); + ini_entries_len += (int)(val - php_optarg); memcpy(ini_entries + ini_entries_len, "\"", 1); ini_entries_len++; memcpy(ini_entries + ini_entries_len, val, len - (val - php_optarg)); - ini_entries_len += len - (val - php_optarg); + ini_entries_len += len - (int)(val - php_optarg); memcpy(ini_entries + ini_entries_len, "\"\n\0", sizeof("\"\n\0")); ini_entries_len += sizeof("\n\0\"") - 2; } else { |