diff options
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/fsock.c | 2 | ||||
| -rw-r--r-- | ext/standard/head.c | 2 | ||||
| -rw-r--r-- | ext/standard/html.c | 5 | ||||
| -rw-r--r-- | ext/standard/metaphone.c | 3 | ||||
| -rw-r--r-- | ext/standard/string.c | 5 |
5 files changed, 10 insertions, 7 deletions
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c index ddc0812c48..4af044b02c 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -33,7 +33,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent) { char *host; long host_len; - int port = -1; + long port = -1; zval *zerrno = NULL, *zerrstr = NULL; double timeout = FG(default_socket_timeout); unsigned long conv; diff --git a/ext/standard/head.c b/ext/standard/head.c index 234468d5ed..c993664269 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -142,7 +142,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t PHP_FUNCTION(setcookie) { char *name, *value = NULL, *path = NULL, *domain = NULL; - time_t expires = 0; + long expires = 0; zend_bool secure = 0; int name_len, value_len, path_len, domain_len; diff --git a/ext/standard/html.c b/ext/standard/html.c index be06b8dbef..fe3b9ad940 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -872,7 +872,8 @@ PHP_FUNCTION(htmlspecialchars) PHP_FUNCTION(html_entity_decode) { char *str, *hint_charset = NULL; - int str_len, hint_charset_len, len, quote_style = ENT_COMPAT; + int str_len, hint_charset_len, len; + long quote_style = ENT_COMPAT; char *replaced; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len, @@ -898,7 +899,7 @@ PHP_FUNCTION(htmlentities) Returns the internal translation table used by htmlspecialchars and htmlentities */ PHP_FUNCTION(get_html_translation_table) { - int which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT; + long which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT; int i, j; char ind[2]; enum entity_charset charset = determine_charset(NULL TSRMLS_CC); diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c index 10e3396edf..716f109b64 100644 --- a/ext/standard/metaphone.c +++ b/ext/standard/metaphone.c @@ -35,7 +35,8 @@ PHP_FUNCTION(metaphone) { char *str; char *result = 0; - int phones = 0, str_len; + int str_len; + long phones = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &str_len, &phones) == FAILURE) { diff --git a/ext/standard/string.c b/ext/standard/string.c index e21cf53f06..341e747f6c 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -202,7 +202,8 @@ PHP_FUNCTION(bin2hex) static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior) { char *s11, *s22; - int len1, len2, start, len; + int len1, len2; + long start, len; start = 0; len = 0; @@ -1228,7 +1229,7 @@ PHP_FUNCTION(pathinfo) zval *tmp; char *path, *ret = NULL; int path_len; - int opt = PHP_PATHINFO_ALL; + long opt = PHP_PATHINFO_ALL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &path, &path_len, &opt) == FAILURE) { return; |