fix MSVC >6 warnings and errors
authorMichael Wallner <mike@php.net>
Sun, 27 Jul 2008 12:00:16 +0000 (12:00 +0000)
committerMichael Wallner <mike@php.net>
Sun, 27 Jul 2008 12:00:16 +0000 (12:00 +0000)
http_request_object.c
http_url_api.c

index 2293041..10a26b0 100644 (file)
@@ -781,7 +781,7 @@ static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM
                }
        } else if (opts) {
                if (prettify_keys) {
-                       zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0);
+                       zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0, NULL);
                }
                ZVAL_ADDREF(opts);
                add_assoc_zval_ex(new_opts, key, len, opts);
index c0fad60..bdfd2cf 100644 (file)
@@ -445,7 +445,7 @@ PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, c
                                return FAILURE;
                        }
                } else {
-                       zval val;
+                       zval val = zval_used_for_init;
                        ZVAL_ZVAL(&val, *data, 1, 0);
                        convert_to_string(&val);