change functions to be consistent between branches

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 5fedf48e2c99fb8f28ab6dccd1cc77a0fb33887b..80dfde8cbd4d33a6ea8732762b1dae69c36ac186 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -911,17 +911,18 @@ PHP_FUNCTION(tempnam)
 {
        zval **ppdir, **ppprefix;
        char *dir, *prefix;
-       int dir_len, prefix_len, p_len;
+       int dir_len;
        char *opened_path;
        char *p;
        int fd;
+       size_t p_len, prefix_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ", &ppdir, &ppprefix) == FAILURE) {
                return;
        }
 
        if (php_stream_path_param_encode(ppdir, &dir, &dir_len, REPORT_ERRORS, FG(default_context)) == FAILURE ||
-               php_stream_path_param_encode(ppprefix, &prefix, &prefix_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
+               php_stream_path_param_encode(ppprefix, &prefix, (int *)&prefix_len, REPORT_ERRORS, FG(default_context)) == FAILURE) {
                RETURN_FALSE;
        }
 

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 6957682b7e239b424da7bea0d1fee2cc9ad4670a..4129e1ec1360f23f4c4a318dcd2908ea26c83699 100644 (file)
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -592,7 +592,7 @@ static size_t php_ftp_dirstream_read(php_stream *stream, char *buf, size_t count
        php_stream *innerstream = (php_stream *)stream->abstract;
        size_t tmp_len;
        char *basename;
-       int basename_len;
+       size_t basename_len;
 
        if (count != sizeof(php_stream_dirent)) {
                return 0;

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 4c30993e8d691fb5af5909083eeab5c848067160..b6acbe3a70b7d476d369012c6b53d140eb886716 100644 (file)
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -227,7 +227,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
                char *f;
                size_t f_len;
 
-               php_basename(tmp, strlen(tmp), NULL, 0,&f, &f_len TSRMLS_CC);
+               php_basename(tmp, strlen(tmp), NULL, 0, &f, &f_len TSRMLS_CC);
 
                if (headers != NULL) {
                        spprintf(&hdr, 0, "%s\r\nX-PHP-Originating-Script: %ld:%s\n", headers, php_getuid(), f);

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index 8e6dd9e248daef1e2fd7c887c76562a9acf41d41..21c69c207a4a9482ec8f8bcd28f57721473f344e 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -136,10 +136,10 @@ PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int freeit,
 PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC);
 PHPAPI void php_u_stripslashes(UChar *str, int *len TSRMLS_DC);
 PHPAPI void php_stripcslashes(char *str, int *len);
-PHPAPI void php_u_basename(UChar *s, int len, UChar *suffix, int sufflen, UChar **p_ret, int *p_len TSRMLS_DC);
-PHPAPI void php_basename(char *s, int len, char *suffix, int sufflen, char **p_ret, int *p_len TSRMLS_DC);
-PHPAPI int php_u_dirname(UChar *str, int len);
-PHPAPI int php_dirname(char *str, int len);
+PHPAPI void php_u_basename(UChar *s, size_t len, UChar *suffix, size_t sufflen, UChar **p_ret, size_t *p_len TSRMLS_DC);
+PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char **p_ret, size_t *p_len TSRMLS_DC);
+PHPAPI size_t php_u_dirname(UChar *str, size_t len);
+PHPAPI size_t php_dirname(char *str, size_t len);
 PHPAPI UChar *php_u_stristr(UChar *s, UChar *t, int s_len, int t_len, zend_bool find_first TSRMLS_DC);
 PHPAPI char *php_stristr(char *s, char *t, size_t s_len, size_t t_len);
 PHPAPI int php_u_strspn(UChar *s1, UChar *s2, UChar *s1_end, UChar *s2_end);

diff --git a/ext/standard/string.c b/ext/standard/string.c
index c7e150dd1e92e4d5a3b71efdb372844b466b7cba..c3f522ae9ca892003c141283939963bdfcdb7470 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1847,7 +1847,7 @@ PHP_FUNCTION(strtotitle)
 
 /* {{{ php_u_basename
  */
-PHPAPI void php_u_basename(UChar *s, int len, UChar *suffix, int sufflen, UChar **p_ret, int *p_len TSRMLS_DC)
+PHPAPI void php_u_basename(UChar *s, size_t len, UChar *suffix, size_t sufflen, UChar **p_ret, size_t *p_len TSRMLS_DC)
 {
        UChar *end, *c, *comp, *cend;
        int state;
@@ -1895,7 +1895,7 @@ PHPAPI void php_u_basename(UChar *s, int len, UChar *suffix, int sufflen, UChar
 
 /* {{{ php_basename
  */
-PHPAPI void php_basename(char *s, int len, char *suffix, int sufflen, char **p_ret, int *p_len TSRMLS_DC)
+PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char **p_ret, size_t *p_len TSRMLS_DC)
 {
        char *ret = NULL, *c, *comp, *cend;
        size_t inc_len, cnt;
@@ -1972,7 +1972,7 @@ PHP_FUNCTION(basename)
        zstr string, suffix = NULL_ZSTR, ret;
        int string_len, suffix_len = 0;
        zend_uchar string_type, suffix_type;
-       int ret_len;
+       size_t ret_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "T|T", &string, &string_len, &string_type, &suffix, &suffix_len, &suffix_type) == FAILURE) {
                return;
@@ -1980,17 +1980,17 @@ PHP_FUNCTION(basename)
 
        if (string_type == IS_UNICODE) {
                php_u_basename(string.u, string_len, suffix.u, suffix_len, &ret.u, &ret_len TSRMLS_CC);
-               RETURN_UNICODEL(ret.u, ret_len, 0);
+               RETURN_UNICODEL(ret.u, (int)ret_len, 0);
        } else {
                php_basename(string.s, string_len, suffix.s, suffix_len, &ret.s, &ret_len TSRMLS_CC);
-               RETURN_STRINGL(ret.s, ret_len, 0);
+               RETURN_STRINGL(ret.s, (int)ret_len, 0);
        }
 }
 /* }}} */
 
 /* {{{ php_u_dirname
    Returns directory name component of path */
-PHPAPI int php_u_dirname(UChar *path, int len)
+PHPAPI size_t php_u_dirname(UChar *path, size_t len)
 {
        return zend_u_dirname(path, len);
 }
@@ -1998,7 +1998,7 @@ PHPAPI int php_u_dirname(UChar *path, int len)
 
 /* {{{ php_dirname
    Returns directory name component of path */
-PHPAPI int php_dirname(char *path, int len)
+PHPAPI size_t php_dirname(char *path, size_t len)
 {
        return zend_dirname(path, len);
 }
@@ -2012,7 +2012,7 @@ PHP_FUNCTION(dirname)
        int str_len;
        zend_uchar str_type;
        zstr ret;
-       int ret_len;
+       size_t ret_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &str, &str_len,
                                                          &str_type) == FAILURE) {
@@ -2027,7 +2027,7 @@ PHP_FUNCTION(dirname)
                ret_len = php_dirname(ret.s, str_len);
        }
 
-       RETURN_ZSTRL(str_type, ret, ret_len, 0);
+       RETURN_ZSTRL(str_type, ret, (int)ret_len, 0);
 }
 /* }}} */
 
@@ -2038,7 +2038,7 @@ PHP_FUNCTION(pathinfo)
        zstr path, ret = NULL_ZSTR;
        int path_len, have_basename, have_ext, have_filename;
        zend_uchar path_type;
-       int ret_len;
+       size_t ret_len;
        zval *tmp;
        long opt = PHP_PATHINFO_ALL;