flush WIP

[m6w6/ext-http] / php_http_negotiate.h

diff --git a/php_http_negotiate.h b/php_http_negotiate.h
index f7405b54e5111a4f66f4fffe743bd3f436384da7..598e871cd03407b95f32ee3bea014a5172fa5cdb 100644 (file)
--- a/php_http_negotiate.h
+++ b/php_http_negotiate.h
@@ -13,58 +13,58 @@
 #ifndef PHP_HTTP_NEGOTIATE_H
 #define PHP_HTTP_NEGOTIATE_H
 
-PHP_HTTP_API HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len TSRMLS_DC);
+PHP_HTTP_API HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len);
 
-static inline HashTable *php_http_negotiate_language(HashTable *supported, php_http_message_t *request TSRMLS_DC)
+static inline HashTable *php_http_negotiate_language(HashTable *supported, php_http_message_t *request)
 {
        HashTable *result = NULL;
        size_t length;
-       char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Language"), &length, request TSRMLS_CC);
+       char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Language"), &length, request);
 
        if (value) {
-               result = php_http_negotiate(value, length, supported, "-", 1 TSRMLS_CC);
+               result = php_http_negotiate(value, length, supported, "-", 1);
        }
        PTR_FREE(value);
 
        return result;
 }
 
-static inline HashTable *php_http_negotiate_encoding(HashTable *supported, php_http_message_t *request TSRMLS_DC)
+static inline HashTable *php_http_negotiate_encoding(HashTable *supported, php_http_message_t *request)
 {
        HashTable *result = NULL;
        size_t length;
-       char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Encoding"), &length, request TSRMLS_CC);
+       char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Encoding"), &length, request);
 
        if (value) {
-               result = php_http_negotiate(value, length, supported, NULL, 0 TSRMLS_CC);
+               result = php_http_negotiate(value, length, supported, NULL, 0);
        }
        PTR_FREE(value);
 
        return result;
 }
 
-static inline HashTable *php_http_negotiate_charset(HashTable *supported, php_http_message_t *request TSRMLS_DC)
+static inline HashTable *php_http_negotiate_charset(HashTable *supported, php_http_message_t *request)
 {
        HashTable *result = NULL;
        size_t length;
-       char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Charset"), &length, request TSRMLS_CC);
+       char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Charset"), &length, request);
 
        if (value) {
-               result = php_http_negotiate(value, length, supported, NULL, 0 TSRMLS_CC);
+               result = php_http_negotiate(value, length, supported, NULL, 0);
        }
        PTR_FREE(value);
 
        return result;
 }
 
-static inline HashTable *php_http_negotiate_content_type(HashTable *supported, php_http_message_t *request TSRMLS_DC)
+static inline HashTable *php_http_negotiate_content_type(HashTable *supported, php_http_message_t *request)
 {
        HashTable *result = NULL;
        size_t length;
-       char *value = php_http_env_get_request_header(ZEND_STRL("Accept"), &length, request TSRMLS_CC);
+       char *value = php_http_env_get_request_header(ZEND_STRL("Accept"), &length, request);
 
        if (value) {
-               result = php_http_negotiate(value, length, supported, "/", 1 TSRMLS_CC);
+               result = php_http_negotiate(value, length, supported, "/", 1);
        }
        PTR_FREE(value);
 
@@ -73,11 +73,11 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported, p
 
 #define PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported) \
        { \
-               zval **value; \
+               zval *value; \
                 \
                zend_hash_internal_pointer_reset((supported)); \
-               if (SUCCESS == zend_hash_get_current_data((supported), (void *) &value)) { \
-                       RETVAL_ZVAL(*value, 1, 0); \
+               if ((value = zend_hash_get_current_data((supported)))) { \
+                       RETVAL_ZVAL_FAST(value); \
                } else { \
                        RETVAL_NULL(); \
                } \
@@ -86,30 +86,30 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported, p
 #define PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array) \
        PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported); \
        if (rs_array) { \
-               HashPosition pos; \
-               zval **value_ptr; \
+               zval *value; \
                 \
-               FOREACH_HASH_VAL(pos, supported, value_ptr) { \
-                       zval *value = php_http_ztyp(IS_STRING, *value_ptr); \
-                       add_assoc_double(rs_array, Z_STRVAL_P(value), 1.0); \
-                       zval_ptr_dtor(&value); \
+               ZEND_HASH_FOREACH_VAL(supported, value) \
+               { \
+                       zend_string *zs = zval_get_string(value); \
+                       add_assoc_double_ex(rs_array, zs->val, zs->len, 1.0); \
+                       zend_string_release(zs); \
                } \
+               ZEND_HASH_FOREACH_END(); \
        }
 
 #define PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(result, supported, rs_array) \
        { \
-               char *key; \
-               uint key_len; \
-               ulong idx; \
+               zend_string *key; \
+               zend_ulong idx; \
                 \
-               if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &key_len, &idx, 1, NULL)) { \
-                       RETVAL_STRINGL(key, key_len-1, 0); \
+               if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &idx, NULL)) { \
+                       RETVAL_STR_COPY(key); \
                } else { \
                        PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported); \
                } \
                \
                if (rs_array) { \
-                       zend_hash_copy(Z_ARRVAL_P(rs_array), result, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); \
+                       zend_hash_copy(Z_ARRVAL_P(rs_array), result, (copy_ctor_func_t) zval_add_ref); \
                } \
                \
                zend_hash_destroy(result); \
@@ -126,7 +126,6 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported, p
                } \
        }
 
-
 #endif
 
 /*