X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_method_api.c;h=873d5b1df14341aa74432b2399bb688c04d74751;hp=c17106d2708cdc9d81fe4beb381c139d508f96a0;hb=1c7ba6f10ddb2a20de8d89f415e2750316b76f2c;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c diff --git a/http_request_method_api.c b/http_request_method_api.c index c17106d..873d5b1 100644 --- a/http_request_method_api.c +++ b/http_request_method_api.c @@ -133,8 +133,8 @@ PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_ } /* }}} */ -/* {{{ unsigned long http_request_method_exists(zend_bool, unsigned long, char *) */ -PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC) +/* {{{ ulong http_request_method_exists(zend_bool, ulong, char *) */ +PHP_HTTP_API ulong _http_request_method_exists(zend_bool by_name, ulong id, const char *name TSRMLS_DC) { if (by_name) { unsigned i; @@ -148,8 +148,9 @@ PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsign zval **data; char *key; ulong idx; + HashPosition pos; - FOREACH_HASH_KEYVAL(&HTTP_G(request).methods.custom, key, idx, data) { + FOREACH_HASH_KEYVAL(pos, &HTTP_G(request).methods.custom, key, idx, data) { if (!strcmp(name, Z_STRVAL_PP(data))) { return idx + HTTP_MAX_REQUEST_METHOD; } @@ -162,12 +163,12 @@ PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsign } /* }}} */ -/* {{{ unsigned long http_request_method_register(char *) */ -PHP_HTTP_API unsigned long _http_request_method_register(const char *method_name, size_t method_name_len TSRMLS_DC) +/* {{{ ulong http_request_method_register(char *) */ +PHP_HTTP_API ulong _http_request_method_register(const char *method_name, size_t method_name_len TSRMLS_DC) { zval array; char *http_method, *method; - unsigned long i, meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD; + ulong i, meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD; method = emalloc(method_name_len + 1); for (i = 0; i < method_name_len; ++i) { @@ -193,7 +194,7 @@ PHP_HTTP_API unsigned long _http_request_method_register(const char *method_name /* }}} */ /* {{{ STATUS http_request_method_unregister(usngigned long) */ -PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC) +PHP_HTTP_API STATUS _http_request_method_unregister(ulong method TSRMLS_DC) { zval **zmethod; char *http_method;