* ditch warnings

diff --git a/http_api.c b/http_api.c
index b08a51a0b353607694446e77b4f490e6bd62cacd..88bb1b2b51404f3fb507c21f700fdcaf4598d894 100644 (file)
--- 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 <pollita@php.net> */
-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 94f17d71fa096769b2dd66b45b33bb2187a04bec..93866f3d7de3b36cf9e5b13cbdbb14a01fb1348a 100644 (file)
--- 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
  */
-