X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_send_api.c;h=10b02f69663095feb7a7576edae547274cb99d44;hb=6c4aac679c57cea2e3f7524974509595dc1a31a2;hp=82bdff01402d8108d8eaca91a95e7fe166c02f22;hpb=1a4ecd0664889f053891e861096f2ae1bc23e6e6;p=m6w6%2Fext-http

diff --git a/http_send_api.c b/http_send_api.c
index 82bdff0..10b02f6 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -106,8 +106,7 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 	char *buf;
 	long got, len = end - begin;
 	
-	switch (mode)
-	{
+	switch (mode) {
 		case SEND_RSRC:
 		{
 			php_stream *s = (php_stream *) data;
@@ -123,8 +122,8 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 				
 				efree(buf);
 			}
+			break;
 		}
-		break;
 
 		case SEND_DATA:
 		{
@@ -136,8 +135,8 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat
 				len -= got;
 				buf += got;
 			}
+			break;
 		}
-		break;
 
 		EMPTY_SWITCH_DEFAULT_CASE();
 	}
@@ -314,8 +313,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 	zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0);
 	range_status = http_get_request_ranges(&ranges, data_size);
 
-	switch (range_status)
-	{
+	switch (range_status) {
 		case RANGE_ERR:
 		{
 			zend_hash_destroy(&ranges);
@@ -341,9 +339,9 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 				/* single range */
 				zval **range, **begin, **end;
 				
-				if (	SUCCESS != zend_hash_index_find(&ranges, 0, (void **) &range) ||
-						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) ||
-						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) {
+				if (	SUCCESS != zend_hash_index_find(&ranges, 0, (void *) &range) ||
+						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) ||
+						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
 					/* this should never happen */
 					zend_hash_destroy(&ranges);
 					http_send_status(500);
@@ -379,8 +377,8 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 				}
 				
 				FOREACH_HASH_VAL(pos, &ranges, range) {
-					if (	SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) &&
-							SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) {
+					if (	SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) &&
+							SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
 						char preface_str[512];
 						size_t preface_len;
 
@@ -493,8 +491,7 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 		
 		magic_setflags(magic, magicmode);
 		
-		switch (data_mode)
-		{
+		switch (data_mode) {
 			case SEND_RSRC:
 			{
 				char *buffer;
@@ -503,17 +500,17 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
 				b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0);
 				ctype = magic_buffer(magic, buffer, b_len);
 				efree(buffer);
+				break;
 			}
-			break;
 			
 			case SEND_DATA:
 				ctype = magic_buffer(magic, data_ptr, data_len);
-			break;
+				break;
 			
 			default:
 				HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL);
 				ctype = magic_file(magic, data_ptr);
-			break;
+				break;
 		}
 		
 		if (ctype) {