- Fix a couple of wranings in the FTP code and in parsedate.y

- Be safer with LC_MESSAGES
- Align with the latest Zend change in call_user_function_ex()

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 0fd428a804989465f3165053ed66133a9ff25af2..6664fd587b3b913eabb9bb8acf7c36bc51e1f24b 100644 (file)
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -464,7 +464,7 @@ ftp_pasv(ftpbuf_t *ftp, int pasv)
                return 0;
 
        for (n=0; n<6; n++)
-               ipbox.c[n] = b[n];
+               ipbox.c[n] = (unsigned char) b[n];
 
        memset(&ftp->pasvaddr, 0, sizeof(ftp->pasvaddr));
        ftp->pasvaddr.sin_family = AF_INET;

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index e8b215c98a660f02094cea816e6d68cb42a5185a..8a4da539917eeeb51ab1ad18379bde8ef6c4e597 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -151,7 +151,7 @@ PHP_FUNCTION(ftp_connect)
                        WRONG_PARAM_COUNT;
                }
                convert_to_long(arg2);
-               port = arg2->value.lval;
+               port = (short) arg2->value.lval;
                break;
        default:
                WRONG_PARAM_COUNT;

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 9c154dc7b826310a882350c9e0bb585e888b1c69..1b13a0159b813a3c5e3524eab77e1a9d33924ccf 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -522,7 +522,7 @@ static int array_user_compare(const void *a, const void *b)
        args[0] = (pval **) f->pData;
        args[1] = (pval **) s->pData;
 
-       if (call_user_function_ex(CG(function_table), NULL, *BG(user_compare_func_name), &retval_ptr, 2, args, 0)==SUCCESS
+       if (call_user_function_ex(CG(function_table), NULL, *BG(user_compare_func_name), &retval_ptr, 2, args, 0, NULL)==SUCCESS
                && retval_ptr) {
                long retval;
 
@@ -976,7 +976,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata)
                
                /* Call the userland function */
                if (call_user_function_ex(CG(function_table), NULL, *BG(array_walk_func_name),
-                                                  &retval_ptr, userdata ? 3 : 2, args, 0) == SUCCESS) {
+                                                  &retval_ptr, userdata ? 3 : 2, args, 0, NULL) == SUCCESS) {
                
                        zval_ptr_dtor(&retval_ptr);
                } else

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 64819c107ead8eed9bc7a95caebf5670fa7bf65a..e8041651a8bc33794746c4ee9b2bc02620ac603d 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1413,7 +1413,7 @@ PHP_FUNCTION(call_user_func)
                RETURN_FALSE;
        }
        SEPARATE_ZVAL(params[0]);
-       if (call_user_function_ex(CG(function_table), NULL, *params[0], &retval_ptr, arg_count-1, params+1, 1)==SUCCESS
+       if (call_user_function_ex(CG(function_table), NULL, *params[0], &retval_ptr, arg_count-1, params+1, 1, NULL)==SUCCESS
                && retval_ptr) {
                COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
        } else {
@@ -1449,7 +1449,7 @@ PHP_FUNCTION(call_user_method)
        SEPARATE_ZVAL(params[0]);
        SEPARATE_ZVAL(params[1]);
        convert_to_string(*params[0]);
-       if (call_user_function_ex(CG(function_table), *params[1], *params[0], &retval_ptr, arg_count-2, params+2, 1)==SUCCESS
+       if (call_user_function_ex(CG(function_table), *params[1], *params[0], &retval_ptr, arg_count-2, params+2, 1, NULL)==SUCCESS
                && retval_ptr) {
                COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
        } else {

diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y
index d92eccd1e227e4afb897115d188275a823161095..b66021e947db72116ff7c3134741b0ace0eb5a2c 100644 (file)
--- a/ext/standard/parsedate.y
+++ b/ext/standard/parsedate.y
@@ -452,9 +452,11 @@ o_merid    : /* NULL */
 
 time_t get_date (const char *p, const time_t *now);
 
-extern struct tm       *gmtime ();
-extern struct tm       *localtime ();
-extern time_t          mktime ();
+#ifndef PHP_WIN32
+extern struct tm       *gmtime();
+extern struct tm       *localtime();
+extern time_t          mktime();
+#endif
 
 /* Month and day table. */
 static TABLE const MonthDayTable[] = {

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 107e85b22ca25483e49c85068d9761b6c92aa084..aa32b4e4a21375b8d649f8169597a6f56634647a 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2126,7 +2126,7 @@ PHP_FUNCTION(setlocale)
                cat = LC_COLLATE;
        else if (!strcasecmp ("LC_CTYPE", category->value.str.val))
                cat = LC_CTYPE;
-#ifndef PHP_WIN32
+#ifdef LC_MESSAGES
        else if (!strcasecmp ("LC_MESSAGES", category->value.str.val))
                cat = LC_MESSAGES;
 #endif

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 286ca463b4f328d492959b6edeca3a663faacb9b..0b68f2faf669ff4ccb3026492cb3e233e9119835 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -207,7 +207,7 @@ void php_var_serialize(pval *buf, pval **struc)
                                MAKE_STD_ZVAL(fname);
                                ZVAL_STRING(fname,"__sleep",1);
 
-                               res =  call_user_function_ex(CG(function_table), *struc, fname, &retval_ptr, 0, 0, 1);
+                               res =  call_user_function_ex(CG(function_table), *struc, fname, &retval_ptr, 0, 0, 1, NULL);
 
                                if ((res == SUCCESS)) {
                                        if (retval_ptr && HASH_OF(retval_ptr)) {
@@ -515,7 +515,7 @@ int php_var_unserialize(pval **rval, const char **p, const char *max)
                                MAKE_STD_ZVAL(fname);
                                ZVAL_STRING(fname,"__wakeup",1);
 
-                               call_user_function_ex(CG(function_table), *rval, fname, &retval_ptr, 0, 0, 1);
+                               call_user_function_ex(CG(function_table), *rval, fname, &retval_ptr, 0, 0, 1, NULL);
 
                                zval_dtor(fname);
                                FREE_ZVAL(fname);

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 441baba15af671b3ab1f89b9ba2bcca460335081..069f92825792d069b9fe079660589f5ab6f2a53e 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -396,7 +396,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
         * We try to call __sleep() method on object. It's supposed to return an
         * array of property names to be serialized.
         */
-       if (call_user_function_ex(CG(function_table), obj, fname, &retval, 0, 0, 1) == SUCCESS) {
+       if (call_user_function_ex(CG(function_table), obj, fname, &retval, 0, 0, 1, NULL) == SUCCESS) {
                if (retval && HASH_OF(retval)) {
                        php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
                        sprintf(tmp_buf, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
@@ -750,7 +750,7 @@ static void php_wddx_pop_element(void *user_data, const char *name)
                                                MAKE_STD_ZVAL(fname);
                                                ZVAL_STRING(fname, "__wakeup", 1);
 
-                                               call_user_function_ex(NULL, obj, fname, &retval, 0, 0, 0);
+                                               call_user_function_ex(NULL, obj, fname, &retval, 0, 0, 0, NULL);
 
                                                zval_dtor(fname);
                                                FREE_ZVAL(fname);