From d9a5eb7f270247c44f4ff78c1f5d03d520e8fec0 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 11 Feb 2005 09:30:17 +0000 Subject: [PATCH] * proper cpp indention --- http.c | 36 +++++++++++++++++++----------------- http_api.c | 43 ++++++++++++++++++++++--------------------- php_http.h | 8 ++++---- php_http_api.h | 6 +++--- 4 files changed, 48 insertions(+), 45 deletions(-) diff --git a/http.c b/http.c index afa95b7..795a3a5 100644 --- a/http.c +++ b/http.c @@ -18,7 +18,7 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include "php.h" @@ -32,27 +32,20 @@ #include "php_http_api.h" #ifdef ZEND_ENGINE_2 -#include "ext/standard/php_http.h" +# include "ext/standard/php_http.h" #endif #ifdef HTTP_HAVE_CURL -#ifdef PHP_WIN32 -#include -#include -#endif +# ifdef PHP_WIN32 +# include +# include +# endif -#include -#endif - -ZEND_DECLARE_MODULE_GLOBALS(http) - -#ifdef COMPILE_DL_HTTP -ZEND_GET_MODULE(http) -#endif +# include /* {{{ ARG_INFO */ -#ifdef ZEND_BEGIN_ARG_INFO +# ifdef ZEND_BEGIN_ARG_INFO ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) @@ -65,11 +58,20 @@ ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); -#else +# else static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; +# endif +/* }}} ARG_INFO */ + +#endif /* HTTP_HAVE_CURL */ + +ZEND_DECLARE_MODULE_GLOBALS(http) + +#ifdef COMPILE_DL_HTTP +ZEND_GET_MODULE(http) #endif -/* }}}*/ + /* {{{ http_functions[] */ function_entry http_functions[] = { diff --git a/http_api.c b/http_api.c index d8a0828..f9091ee 100644 --- a/http_api.c +++ b/http_api.c @@ -18,7 +18,7 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include @@ -37,9 +37,9 @@ #include "SAPI.h" #ifdef ZEND_ENGINE_2 -#include "ext/standard/php_http.h" +# include "ext/standard/php_http.h" #else -#include "http_build_query.c" + #include "http_build_query.c" #endif #include "php_http.h" @@ -47,13 +47,14 @@ #ifdef HTTP_HAVE_CURL -#ifdef PHP_WIN32 -#include -#include -#endif +# ifdef PHP_WIN32 +# include +# include +# endif + +# include +# include -#include -#include #endif @@ -1428,7 +1429,7 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz /* single range */ if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) { char range_header[256] = {0}; - + zend_hash_index_find(Z_ARRVAL_P(zranges), 0, (void **) &zrange); zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin); zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end); @@ -1444,9 +1445,9 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz /* multi range */ else { int i; - char bound[23] = {0}, preface[1024] = {0}, + char bound[23] = {0}, preface[1024] = {0}, multi_header[68] = "Content-Type: multipart/byteranges; boundary="; - + snprintf(bound, 22, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C)); strncat(multi_header, bound + 2, 21); http_send_header(multi_header); @@ -1462,22 +1463,22 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz SUCCESS != zend_hash_index_find( Z_ARRVAL_PP(zrange), 1, (void **) &end)) { break; - } + } snprintf(preface, 1023, - HTTP_CRLF "%s" + HTTP_CRLF "%s" HTTP_CRLF "Content-Type: %s" HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld" - HTTP_CRLF + HTTP_CRLF HTTP_CRLF, - - bound, - HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream", - **begin, - **end, + + bound, + HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream", + **begin, + **end, size ); - + php_body_write(preface, strlen(preface) TSRMLS_CC); http_send_chunk(data, **begin, **end + 1, mode); } diff --git a/php_http.h b/php_http.h index 5f96f52..0b65451 100644 --- a/php_http.h +++ b/php_http.h @@ -28,14 +28,14 @@ extern zend_module_entry http_module_entry; #define phpext_http_ptr &http_module_entry #ifdef ZTS -#include "TSRM.h" -#define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v) +# include "TSRM.h" +# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v) #else -#define HTTP_G(v) (http_globals.v) +# define HTTP_G(v) (http_globals.v) #endif #ifndef ZEND_ENGINE_2 -#include "php_http_build_query.h" +# include "php_http_build_query.h" #endif PHP_FUNCTION(http_date); diff --git a/php_http_api.h b/php_http_api.h index 101857e..8ca390d 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -19,13 +19,13 @@ #define PHP_HTTP_API_H #ifdef PHP_WIN32 -#define PHP_HTTP_API __declspec(dllexport) +# define PHP_HTTP_API __declspec(dllexport) #else -#define PHP_HTTP_API +# define PHP_HTTP_API #endif #ifndef ZEND_ENGINE_2 -#include "php_http_build_query.h" +# include "php_http_build_query.h" #endif /* make functions that return SUCCESS|FAILURE more obvious */ -- 2.30.2