From 054426ee13e1680245998c59f571effca5ceda4b Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 25 Feb 2005 18:47:01 +0000 Subject: [PATCH] * ditch warnings --- http_api.c | 9 ++++----- php_http_api.h | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/http_api.c b/http_api.c index b08a51a..88bb1b2 100644 --- a/http_api.c +++ b/http_api.c @@ -1426,7 +1426,7 @@ PHP_HTTP_API STATUS _http_split_response_ex( char *response, char *body = NULL; char *header = response; - while ((response - header + 4) < response_len) { + while (0 < (response_len - (response - header + 4))) { if ( (*response++ == '\r') && (*response++ == '\n') && (*response++ == '\r') && @@ -1614,9 +1614,9 @@ PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC) /* }}} */ #ifndef ZEND_ENGINE_2 -/* {{{ php_url_encode_hash +/* {{{ php_url_encode_hash Author: Sarah Golemon */ -PHP_HTTP_API int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, +PHP_HTTP_API STATUS php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, const char *num_prefix, int num_prefix_len, const char *key_prefix, int key_prefix_len, const char *key_suffix, int key_suffix_len, @@ -1786,5 +1786,4 @@ PHP_HTTP_API int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, * End: * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 - */ - + */ \ No newline at end of file diff --git a/php_http_api.h b/php_http_api.h index 94f17d7..93866f3 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -156,7 +156,7 @@ PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS #ifndef ZEND_ENGINE_2 #define php_url_encode_hash(ht, formstr) php_url_encode_hash_ex((ht), (formstr), NULL, 0, NULL, 0, NULL, 0, NULL TSRMLS_CC) -PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, +PHP_HTTP_API STATUS php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, const char *num_prefix, int num_prefix_len, const char *key_prefix, int key_prefix_len, const char *key_suffix, int key_suffix_len, @@ -175,4 +175,3 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - -- 2.30.2