X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.h;h=6ae0ac38af2b081d9967b1876b544e25fac0146c;hp=926804806701f1ecba675f8f54d8fbd6e12571e9;hb=95c6c900d04096d332c422e3f597186b7184c5ab;hpb=455b900ef81b046e1102f267e711338382019253

diff --git a/php_http_url.h b/php_http_url.h
index 9268048..6ae0ac3 100644
--- a/php_http_url.h
+++ b/php_http_url.h
@@ -57,46 +57,28 @@ typedef struct php_http_url {
 	char *fragment;
 } php_http_url_t;
 
-PHP_HTTP_API php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC);
-PHP_HTTP_API php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags TSRMLS_DC);
-/* deprecated */
-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);
-/* use this instead */
-PHP_HTTP_API php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags TSRMLS_DC);
+PHP_HTTP_API php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags);
+PHP_HTTP_API php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags);
+PHP_HTTP_API php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags);
 PHP_HTTP_API php_http_url_t *php_http_url_copy(const php_http_url_t *url, zend_bool persistent);
 PHP_HTTP_API php_http_url_t *php_http_url_from_struct(HashTable *ht);
-PHP_HTTP_API php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC);
-PHP_HTTP_API HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct TSRMLS_DC);
+PHP_HTTP_API php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags);
+PHP_HTTP_API HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct);
 PHP_HTTP_API char *php_http_url_to_string(const php_http_url_t *url, char **url_str, size_t *url_len, zend_bool persistent);
 PHP_HTTP_API char *php_http_url_authority_to_string(const php_http_url_t *url, char **url_str, size_t *url_len);
 PHP_HTTP_API void php_http_url_free(php_http_url_t **url);
 
-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 *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len TSRMLS_DC);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len);
 
-static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC)
+static inline void php_http_url_argsep(const char **str, size_t *len)
 {
-	if (SUCCESS != php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0 TSRMLS_CC) || !*len) {
+	if (SUCCESS != php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0) || !*len) {
 		*str = PHP_HTTP_URL_ARGSEP;
 		*len = lenof(PHP_HTTP_URL_ARGSEP);
 	}
 }
 
-static inline php_url *php_http_url_to_php_url(php_http_url_t *url)
-{
-	php_url *purl = ecalloc(1, sizeof(*purl));
-
-	if (url->scheme)   purl->scheme   = estrdup(url->scheme);
-	if (url->pass)     purl->pass     = estrdup(url->pass);
-	if (url->user)     purl->user     = estrdup(url->user);
-	if (url->host)     purl->host     = estrdup(url->host);
-	if (url->path)     purl->path     = estrdup(url->path);
-	if (url->query)    purl->query    = estrdup(url->query);
-	if (url->fragment) purl->fragment = estrdup(url->fragment);
-
-	return purl;
-}
-
 static inline zend_bool php_http_url_is_empty(const php_http_url_t *url) {
 	return !(url->scheme || url->pass || url->user || url->host || url->port ||	url->path || url->query || url->fragment);
 }