Skip to content

Commit ff22d58

Browse files
author
foobar
committed
WS & CS fix
1 parent 465bb61 commit ff22d58

File tree

1 file changed

+54
-47
lines changed

1 file changed

+54
-47
lines changed

‎main/output.c

Lines changed: 54 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size, zend_bool
151151
return FAILURE;
152152
}
153153
if (chunk_size > 0) {
154-
if (chunk_size==1) {
154+
if (chunk_size == 1) {
155155
chunk_size = 4096;
156156
}
157-
initial_size = (chunk_size*3/2);
158-
block_size = chunk_size/2;
157+
initial_size = (chunk_size * 3 / 2);
158+
block_size = chunk_size / 2;
159159
} else {
160-
initial_size = 40*1024;
161-
block_size = 10*1024;
160+
initial_size = 40 * 1024;
161+
block_size = 10 * 1024;
162162
}
163163
return php_ob_init(initial_size, block_size, output_handler, chunk_size, erase TSRMLS_CC);
164164
}
@@ -195,9 +195,10 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS
195195
php_ob_buffer *prev_ob_buffer_p=NULL;
196196
php_ob_buffer orig_ob_buffer;
197197

198-
if (OG(ob_nesting_level)==0) {
198+
if (OG(ob_nesting_level) == 0) {
199199
return;
200200
}
201+
201202
status = 0;
202203
if (!OG(active_ob_buffer).status & PHP_OUTPUT_HANDLER_START) {
203204
/* our first call */
@@ -229,25 +230,25 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS
229230

230231
ALLOC_INIT_ZVAL(orig_buffer);
231232
ZVAL_STRINGL(orig_buffer, OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length, 1);
232-
orig_buffer->refcount=2; /* don't let call_user_function() destroy our buffer */
233-
orig_buffer->is_ref=1;
233+
orig_buffer->refcount = 2; /* don't let call_user_function() destroy our buffer */
234+
orig_buffer->is_ref = 1;
234235

235236
ALLOC_INIT_ZVAL(z_status);
236237
ZVAL_LONG(z_status, status);
237238

238239
params[0] = &orig_buffer;
239240
params[1] = &z_status;
240241
OG(ob_lock) = 1;
241-
if (call_user_function_ex(CG(function_table), NULL, OG(active_ob_buffer).output_handler, &alternate_buffer, 2, params, 1, NULL TSRMLS_CC)==SUCCESS) {
242-
if (!(Z_TYPE_P(alternate_buffer)==IS_BOOL && Z_BVAL_P(alternate_buffer)==0)) {
242+
if (call_user_function_ex(CG(function_table), NULL, OG(active_ob_buffer).output_handler, &alternate_buffer, 2, params, 1, NULL TSRMLS_CC) == SUCCESS) {
243+
if (!(Z_TYPE_P(alternate_buffer) == IS_BOOL && Z_BVAL_P(alternate_buffer) == 0)) {
243244
convert_to_string_ex(&alternate_buffer);
244245
final_buffer = Z_STRVAL_P(alternate_buffer);
245246
final_buffer_length = Z_STRLEN_P(alternate_buffer);
246247
}
247248
}
248249
OG(ob_lock) = 0;
249250
zval_ptr_dtor(&OG(active_ob_buffer).output_handler);
250-
orig_buffer->refcount -=2;
251+
orig_buffer->refcount -= 2;
251252
if (orig_buffer->refcount <= 0) { /* free the zval */
252253
zval_dtor(orig_buffer);
253254
FREE_ZVAL(orig_buffer);
@@ -260,7 +261,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS
260261
final_buffer_length = OG(active_ob_buffer).text_length;
261262
}
262263

263-
if (OG(ob_nesting_level)==1) { /* end buffering */
264+
if (OG(ob_nesting_level) == 1) { /* end buffering */
264265
if (SG(headers_sent) && !SG(request_info).headers_only) {
265266
OG(php_body_write) = php_ub_body_write_no_header;
266267
} else {
@@ -281,12 +282,12 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS
281282
to_be_destroyed_handled_output[1] = OG(active_ob_buffer).internal_output_handler_buffer;
282283
}
283284
}
284-
if (OG(ob_nesting_level)>1) { /* restore previous buffer */
285+
if (OG(ob_nesting_level) > 1) { /* restore previous buffer */
285286
zend_stack_top(&OG(ob_buffers), (void **) &prev_ob_buffer_p);
286287
orig_ob_buffer = OG(active_ob_buffer);
287288
OG(active_ob_buffer) = *prev_ob_buffer_p;
288289
zend_stack_del_top(&OG(ob_buffers));
289-
if (!just_flush && OG(ob_nesting_level)==2) { /* destroy the stack */
290+
if (!just_flush && OG(ob_nesting_level) == 2) { /* destroy the stack */
290291
zend_stack_destroy(&OG(ob_buffers));
291292
}
292293
}
@@ -331,7 +332,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS
331332
* End output buffering (all buffers) */
332333
PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC)
333334
{
334-
while (OG(ob_nesting_level)!=0) {
335+
while (OG(ob_nesting_level) != 0) {
335336
php_end_ob_buffer(send_buffer, 0 TSRMLS_CC);
336337
}
337338
}
@@ -341,23 +342,23 @@ PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC)
341342
*/
342343
PHPAPI void php_start_implicit_flush(TSRMLS_D)
343344
{
344-
OG(implicit_flush)=1;
345+
OG(implicit_flush) = 1;
345346
}
346347
/* }}} */
347348

348349
/* {{{ php_end_implicit_flush
349350
*/
350351
PHPAPI void php_end_implicit_flush(TSRMLS_D)
351352
{
352-
OG(implicit_flush)=0;
353+
OG(implicit_flush) = 0;
353354
}
354355
/* }}} */
355356

356357
/* {{{ php_ob_set_internal_handler
357358
*/
358359
PHPAPI void php_ob_set_internal_handler(php_output_handler_func_t internal_output_handler, uint buffer_size, char *handler_name, zend_bool erase TSRMLS_DC)
359360
{
360-
if (OG(ob_nesting_level)==0 || OG(active_ob_buffer).internal_output_handler || strcmp(OG(active_ob_buffer).handler_name, OB_DEFAULT_HANDLER_NAME)) {
361+
if (OG(ob_nesting_level) == 0 || OG(active_ob_buffer).internal_output_handler || strcmp(OG(active_ob_buffer).handler_name, OB_DEFAULT_HANDLER_NAME)) {
361362
php_start_ob_buffer(NULL, buffer_size, erase TSRMLS_CC);
362363
}
363364

@@ -382,10 +383,10 @@ static inline void php_ob_allocate(TSRMLS_D)
382383
{
383384
if (OG(active_ob_buffer).size<OG(active_ob_buffer).text_length) {
384385
while (OG(active_ob_buffer).size <= OG(active_ob_buffer).text_length) {
385-
OG(active_ob_buffer).size+=OG(active_ob_buffer).block_size;
386+
OG(active_ob_buffer).size += OG(active_ob_buffer).block_size;
386387
}
387388

388-
OG(active_ob_buffer).buffer = (char *) erealloc(OG(active_ob_buffer).buffer, OG(active_ob_buffer).size+1);
389+
OG(active_ob_buffer).buffer = (char *) erealloc(OG(active_ob_buffer).buffer, OG(active_ob_buffer).size + 1);
389390
}
390391
}
391392
/* }}} */
@@ -407,27 +408,27 @@ PHPAPI int php_ob_init_conflict(char *handler_new, char *handler_set TSRMLS_DC)
407408
*/
408409
static int php_ob_init_named(uint initial_size, uint block_size, char *handler_name, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC)
409410
{
410-
if (OG(ob_nesting_level)>0) {
411+
if (OG(ob_nesting_level) > 0) {
411412
#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
412413
if (!strncmp(handler_name, "ob_gzhandler", sizeof("ob_gzhandler")) && php_ob_gzhandler_check(TSRMLS_C)) {
413414
return FAILURE;
414415
}
415416
#endif
416-
if (OG(ob_nesting_level)==1) { /* initialize stack */
417+
if (OG(ob_nesting_level) == 1) { /* initialize stack */
417418
zend_stack_init(&OG(ob_buffers));
418419
}
419420
zend_stack_push(&OG(ob_buffers), &OG(active_ob_buffer), sizeof(php_ob_buffer));
420421
}
421422
OG(ob_nesting_level)++;
422423
OG(active_ob_buffer).block_size = block_size;
423424
OG(active_ob_buffer).size = initial_size;
424-
OG(active_ob_buffer).buffer = (char *) emalloc(initial_size+1);
425+
OG(active_ob_buffer).buffer = (char *) emalloc(initial_size + 1);
425426
OG(active_ob_buffer).text_length = 0;
426427
OG(active_ob_buffer).output_handler = output_handler;
427428
OG(active_ob_buffer).chunk_size = chunk_size;
428429
OG(active_ob_buffer).status = 0;
429430
OG(active_ob_buffer).internal_output_handler = NULL;
430-
OG(active_ob_buffer).handler_name = estrdup(handler_name&&handler_name[0]?handler_name:OB_DEFAULT_HANDLER_NAME);
431+
OG(active_ob_buffer).handler_name = estrdup(handler_name&&handler_name[0] ? handler_name : OB_DEFAULT_HANDLER_NAME);
431432
OG(active_ob_buffer).erase = erase;
432433
OG(php_body_write) = php_b_body_write;
433434
return SUCCESS;
@@ -470,7 +471,7 @@ static int php_ob_init(uint initial_size, uint block_size, zval *output_handler,
470471
zval_dtor(handler_zval);
471472
FREE_ZVAL(handler_zval);
472473
}
473-
handler_name += len+1;
474+
handler_name += len + 1;
474475
efree(next_handler_name);
475476
}
476477
handler_zval = php_ob_handler_from_string(handler_name TSRMLS_CC);
@@ -489,7 +490,7 @@ static int php_ob_init(uint initial_size, uint block_size, zval *output_handler,
489490
efree(handler_name);
490491
/* init all array elements recursively */
491492
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(output_handler), &pos);
492-
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(output_handler), (void **)&tmp, &pos) == SUCCESS) {
493+
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(output_handler), (void **) &tmp, &pos) == SUCCESS) {
493494
result = php_ob_init(initial_size, block_size, *tmp, chunk_size, erase TSRMLS_CC);
494495
zend_hash_move_forward_ex(Z_ARRVAL_P(output_handler), &pos);
495496
}
@@ -518,14 +519,14 @@ static int php_ob_list_each(php_ob_buffer *ob_buffer, zval *ob_handler_array)
518519
*/
519520
PHP_FUNCTION(ob_list_handlers)
520521
{
521-
if (ZEND_NUM_ARGS()!=0) {
522+
if (ZEND_NUM_ARGS() != 0) {
522523
ZEND_WRONG_PARAM_COUNT();
523524
RETURN_FALSE;
524525
}
525526

526527
array_init(return_value);
527528
if (OG(ob_nesting_level)) {
528-
if (OG(ob_nesting_level)>1) {
529+
if (OG(ob_nesting_level) > 1) {
529530
zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_ob_list_each, return_value);
530531
}
531532
php_ob_list_each(&OG(active_ob_buffer), return_value);
@@ -557,7 +558,7 @@ PHPAPI int php_ob_handler_used(char *handler_name TSRMLS_DC)
557558
if (!strcmp(OG(active_ob_buffer).handler_name, handler_name)) {
558559
return 1;
559560
}
560-
if (OG(ob_nesting_level)>1) {
561+
if (OG(ob_nesting_level) > 1) {
561562
zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_ob_handler_used_each, &tmp);
562563
}
563564
}
@@ -572,17 +573,16 @@ static inline void php_ob_append(const char *text, uint text_length TSRMLS_DC)
572573
char *target;
573574
int original_ob_text_length;
574575

575-
original_ob_text_length=OG(active_ob_buffer).text_length;
576+
original_ob_text_length = OG(active_ob_buffer).text_length;
576577
OG(active_ob_buffer).text_length = OG(active_ob_buffer).text_length + text_length;
577578

578579
php_ob_allocate(TSRMLS_C);
579580
target = OG(active_ob_buffer).buffer+original_ob_text_length;
580581
memcpy(target, text, text_length);
581-
target[text_length]=0;
582+
target[text_length] = 0;
582583

583584
/* If implicit_flush is On or chunked buffering, send contents to next buffer and return. */
584-
if (OG(active_ob_buffer).chunk_size
585-
&& OG(active_ob_buffer).text_length >= OG(active_ob_buffer).chunk_size) {
585+
if (OG(active_ob_buffer).chunk_size && OG(active_ob_buffer).text_length >= OG(active_ob_buffer).chunk_size) {
586586
zval *output_handler = OG(active_ob_buffer).output_handler;
587587

588588
if (output_handler) {
@@ -620,7 +620,7 @@ static inline void php_ob_prepend(const char *text, uint text_length)
620620
* Return the current output buffer */
621621
PHPAPI int php_ob_get_buffer(zval *p TSRMLS_DC)
622622
{
623-
if (OG(ob_nesting_level)==0) {
623+
if (OG(ob_nesting_level) == 0) {
624624
return FAILURE;
625625
}
626626
ZVAL_STRINGL(p, OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length, 1);
@@ -716,12 +716,14 @@ PHP_FUNCTION(ob_start)
716716
RETURN_FALSE;
717717
}
718718

719-
if (chunk_size < 0)
719+
if (chunk_size < 0) {
720720
chunk_size = 0;
721+
}
721722

722-
if (php_start_ob_buffer(output_handler, chunk_size, erase TSRMLS_CC)==FAILURE) {
723+
if (php_start_ob_buffer(output_handler, chunk_size, erase TSRMLS_CC) == FAILURE) {
723724
RETURN_FALSE;
724725
}
726+
725727
RETURN_TRUE;
726728
}
727729
/* }}} */
@@ -821,9 +823,10 @@ PHP_FUNCTION(ob_get_flush)
821823
}
822824

823825
/* get contents */
824-
if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) {
826+
if (php_ob_get_buffer(return_value TSRMLS_CC) == FAILURE) {
825827
RETURN_FALSE;
826828
}
829+
827830
/* error checks */
828831
if (!OG(ob_nesting_level)) {
829832
php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush.");
@@ -833,6 +836,7 @@ PHP_FUNCTION(ob_get_flush)
833836
php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s.", OG(active_ob_buffer).handler_name);
834837
RETURN_FALSE;
835838
}
839+
836840
/* flush */
837841
php_end_ob_buffer(1, 0 TSRMLS_CC);
838842
}
@@ -846,9 +850,10 @@ PHP_FUNCTION(ob_get_clean)
846850
ZEND_WRONG_PARAM_COUNT();
847851

848852
/* get contents */
849-
if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) {
853+
if (php_ob_get_buffer(return_value TSRMLS_CC) == FAILURE) {
850854
RETURN_FALSE;
851855
}
856+
852857
/* error checks */
853858
if (!OG(ob_nesting_level)) {
854859
php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete.");
@@ -858,6 +863,7 @@ PHP_FUNCTION(ob_get_clean)
858863
php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer %s.", OG(active_ob_buffer).handler_name);
859864
RETURN_FALSE;
860865
}
866+
861867
/* delete buffer */
862868
php_end_ob_buffer(0, 0 TSRMLS_CC);
863869
}
@@ -871,7 +877,7 @@ PHP_FUNCTION(ob_get_contents)
871877
ZEND_WRONG_PARAM_COUNT();
872878
}
873879

874-
if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) {
880+
if (php_ob_get_buffer(return_value TSRMLS_CC) == FAILURE) {
875881
RETURN_FALSE;
876882
}
877883
}
@@ -885,7 +891,7 @@ PHP_FUNCTION(ob_get_level)
885891
ZEND_WRONG_PARAM_COUNT();
886892
}
887893

888-
RETURN_LONG (OG(ob_nesting_level));
894+
RETURN_LONG(OG(ob_nesting_level));
889895
}
890896
/* }}} */
891897

@@ -897,7 +903,7 @@ PHP_FUNCTION(ob_get_length)
897903
ZEND_WRONG_PARAM_COUNT();
898904
}
899905

900-
if (php_ob_get_length(return_value TSRMLS_CC)==FAILURE) {
906+
if (php_ob_get_length(return_value TSRMLS_CC) == FAILURE) {
901907
RETURN_FALSE;
902908
}
903909
}
@@ -940,19 +946,20 @@ PHP_FUNCTION(ob_get_status)
940946
int argc = ZEND_NUM_ARGS();
941947
zend_bool full_status = 0;
942948

943-
if (zend_parse_parameters(argc TSRMLS_CC, "|b", &full_status) == FAILURE )
949+
if (zend_parse_parameters(argc TSRMLS_CC, "|b", &full_status) == FAILURE) {
944950
RETURN_FALSE;
951+
}
945952

946953
array_init(return_value);
947954

948955
if (full_status) {
949-
if (OG(ob_nesting_level)>1) {
956+
if (OG(ob_nesting_level) > 1) {
950957
zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *elem, void *))php_ob_buffer_status, return_value);
951958
}
952-
if (OG(ob_nesting_level)>0 && php_ob_buffer_status(&OG(active_ob_buffer), return_value)==FAILURE) {
959+
if (OG(ob_nesting_level) > 0 && php_ob_buffer_status(&OG(active_ob_buffer), return_value) == FAILURE) {
953960
RETURN_FALSE;
954961
}
955-
} else if (OG(ob_nesting_level)>0) {
962+
} else if (OG(ob_nesting_level) > 0) {
956963
add_assoc_long(return_value, "level", OG(ob_nesting_level));
957964
if (OG(active_ob_buffer).internal_output_handler) {
958965
add_assoc_long(return_value, "type", PHP_OUTPUT_HANDLER_INTERNAL);
@@ -974,12 +981,12 @@ PHP_FUNCTION(ob_implicit_flush)
974981
zval **zv_flag;
975982
int flag;
976983

977-
switch(ZEND_NUM_ARGS()) {
984+
switch (ZEND_NUM_ARGS()) {
978985
case 0:
979986
flag = 1;
980987
break;
981988
case 1:
982-
if (zend_get_parameters_ex(1, &zv_flag)==FAILURE) {
989+
if (zend_get_parameters_ex(1, &zv_flag) == FAILURE) {
983990
RETURN_FALSE;
984991
}
985992
convert_to_long_ex(zv_flag);

0 commit comments

Comments
 (0)