header cleanups; fix IDE warnings

[m6w6/ext-http] / php_http_url.h

diff --git a/php_http_url.h b/php_http_url.h
index 7b16c0119f17e723fd5f1cd6087d9fe0ae9e4b52..3216403502df9fcb87a24fbf322b785314bf7e6b 100644 (file)
--- a/php_http_url.h
+++ b/php_http_url.h
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_url_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_URL_H
 #define PHP_HTTP_URL_H
 
@@ -39,8 +37,19 @@
 PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC);
 PHP_HTTP_API char *php_http_url_absolute(const char *url, int flags TSRMLS_DC);
 
-PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, zend_bool override_argsep, char *pre_encoded_data, size_t pre_encoded_len, char **encoded_data, size_t *encoded_len TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_url_encode_hash_recursive(HashTable *ht, php_http_buffer_t *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC);
+PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC);
+PHP_HTTP_API STATUS php_http_url_encode_hash_ex(HashTable *ht, php_http_buffer_t *str, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *prefix_str, size_t prefix_len TSRMLS_DC);
+
+static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC)
+{
+       *str = INI_STR("arg_separator.output");
+       *len = strlen(*str);
+
+       if (!*len) {
+               *str = PHP_HTTP_URL_ARGSEP;
+               *len = lenof(PHP_HTTP_URL_ARGSEP);
+       }
+}
 
 static inline php_url *php_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_DC)
 {
@@ -104,9 +113,11 @@ static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS
                        default:
                                zval_dtor(strct);
                                array_init(strct);
+                               /* no break */
                        case IS_ARRAY:
                        case IS_OBJECT:
                                INIT_PZVAL_ARRAY((&arr), HASH_OF(strct));
+                               break;
                }
        } else {
                INIT_PZVAL(&arr);