X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_options.h;h=4fff611a3b40aadfeac1c5d210894b369a9ec0dd;hp=67268155e7adacde6310041c410e02ae0e2f3506;hb=aa6bad843b38494eeceb6d172b781fffb2a9998f;hpb=eaa046dc3e6496e523a17c3b786ef27067b9795c

diff --git a/php_http_options.h b/php_http_options.h
index 6726815..4fff611 100644
--- a/php_http_options.h
+++ b/php_http_options.h
@@ -16,7 +16,7 @@
 typedef struct php_http_option php_http_option_t;
 typedef struct php_http_options php_http_options_t;
 
-typedef STATUS (*php_http_option_set_callback_t)(php_http_option_t *opt, zval *val, void *userdata);
+typedef ZEND_RESULT_CODE (*php_http_option_set_callback_t)(php_http_option_t *opt, zval *val, void *userdata);
 typedef zval *(*php_http_option_get_callback_t)(php_http_option_t *opt, HashTable *options, void *userdata);
 
 struct php_http_options {
@@ -31,22 +31,18 @@ struct php_http_options {
 struct php_http_option {
 	php_http_options_t suboptions;
 
-	struct {
-		const char *s;
-		size_t l;
-		ulong h;
-	} name;
-
+	zend_string *name;
 	ulong option;
 	zend_uchar type;
 	unsigned flags;
 	zval defval;
 
 	php_http_option_set_callback_t setter;
+	unsigned persistent:1;
 };
 
 PHP_HTTP_API php_http_options_t *php_http_options_init(php_http_options_t *registry, zend_bool persistent);
-PHP_HTTP_API STATUS php_http_options_apply(php_http_options_t *registry, HashTable *options, void *userdata);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_options_apply(php_http_options_t *registry, HashTable *options, void *userdata);
 PHP_HTTP_API void php_http_options_dtor(php_http_options_t *registry);
 PHP_HTTP_API void php_http_options_free(php_http_options_t **registry);