Skip to content

Commit feb6dc6

Browse files
committed
ext/session: use true/false rather than 1/0
1 parent ba786eb commit feb6dc6

5 files changed

Lines changed: 110 additions & 110 deletions

File tree

ext/session/mod_files.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ PS_READ_FUNC(files)
486486
return SUCCESS;
487487
}
488488

489-
*val = zend_string_alloc(sbuf.st_size, 0);
489+
*val = zend_string_alloc(sbuf.st_size, false);
490490

491491
#ifdef HAVE_PREAD
492492
n = pread(data->fd, ZSTR_VAL(*val), ZSTR_LEN(*val), 0);
@@ -519,7 +519,7 @@ PS_READ_FUNC(files)
519519
} else {
520520
php_error_docref(NULL, E_WARNING, "Read returned less bytes than requested");
521521
}
522-
zend_string_release_ex(*val, 0);
522+
zend_string_release_ex(*val, false);
523523
*val = ZSTR_EMPTY_ALLOC();
524524
return FAILURE;
525525
}
@@ -675,7 +675,7 @@ PS_CREATE_SID_FUNC(files)
675675
/* Check collision */
676676
/* FIXME: mod_data(data) should not be NULL (User handler could be NULL) */
677677
if (data && ps_files_key_exists(data, sid) == SUCCESS) {
678-
zend_string_release_ex(sid, 0);
678+
zend_string_release_ex(sid, false);
679679
sid = NULL;
680680
if (--maxfail < 0) {
681681
return NULL;

ext/session/mod_mm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,15 +359,15 @@ PS_READ_FUNC(mm)
359359
return FAILURE;
360360
}
361361
if (PS(use_cookies)) {
362-
PS(send_cookie) = 1;
362+
PS(send_cookie) = true;
363363
}
364364
php_session_reset_id();
365365
PS(session_status) = php_session_active;
366366
}
367367

368368
sd = ps_sd_lookup(data, PS(id), false);
369369
if (sd) {
370-
*val = zend_string_init(sd->data, sd->datalen, 0);
370+
*val = zend_string_init(sd->data, sd->datalen, false);
371371
ret = SUCCESS;
372372
}
373373

@@ -476,7 +476,7 @@ PS_CREATE_SID_FUNC(mm)
476476
/* Check collision */
477477
if (ps_mm_key_exists(data, sid) == SUCCESS) {
478478
if (sid) {
479-
zend_string_release_ex(sid, 0);
479+
zend_string_release_ex(sid, false);
480480
sid = NULL;
481481
}
482482
if (!(maxfail--)) {

ext/session/mod_user.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ static void ps_call_handler(zval *func, int argc, zval *argv, zval *retval)
2727
{
2828
int i;
2929
if (PS(in_save_handler)) {
30-
PS(in_save_handler) = 0;
30+
PS(in_save_handler) = false;
3131
ZVAL_UNDEF(retval);
3232
php_error_docref(NULL, E_WARNING, "Cannot call session save handler in a recursive manner");
3333
return;
3434
}
35-
PS(in_save_handler) = 1;
35+
PS(in_save_handler) = true;
3636
if (call_user_function(NULL, NULL, func, retval, argc, argv) == FAILURE) {
3737
zval_ptr_dtor(retval);
3838
ZVAL_UNDEF(retval);
3939
} else if (Z_ISUNDEF_P(retval)) {
4040
ZVAL_NULL(retval);
4141
}
42-
PS(in_save_handler) = 0;
42+
PS(in_save_handler) = false;
4343
for (i = 0; i < argc; i++) {
4444
zval_ptr_dtor(&argv[i]);
4545
}
@@ -100,7 +100,7 @@ PS_OPEN_FUNC(user)
100100
zend_bailout();
101101
} zend_end_try();
102102

103-
PS(mod_user_implemented) = 1;
103+
PS(mod_user_implemented) = true;
104104

105105
ret = verify_bool_return_type_userland_calls(&retval);
106106
zval_ptr_dtor(&retval);
@@ -109,7 +109,7 @@ PS_OPEN_FUNC(user)
109109

110110
PS_CLOSE_FUNC(user)
111111
{
112-
bool bailout = 0;
112+
bool bailout = false;
113113
zval retval;
114114
zend_result ret = FAILURE;
115115

@@ -123,10 +123,10 @@ PS_CLOSE_FUNC(user)
123123
zend_try {
124124
ps_call_handler(&PSF(close), 0, NULL, &retval);
125125
} zend_catch {
126-
bailout = 1;
126+
bailout = true;
127127
} zend_end_try();
128128

129-
PS(mod_user_implemented) = 0;
129+
PS(mod_user_implemented) = false;
130130

131131
if (bailout) {
132132
if (!Z_ISUNDEF(retval)) {

ext/session/mod_user_class.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ PHP_METHOD(SessionHandler, open)
5454
} zend_end_try();
5555

5656
if (SUCCESS == ret) {
57-
PS(mod_user_is_open) = 1;
57+
PS(mod_user_is_open) = true;
5858
}
5959

6060
RETURN_BOOL(SUCCESS == ret);
@@ -70,7 +70,7 @@ PHP_METHOD(SessionHandler, close)
7070

7171
PS_SANITY_CHECK_IS_OPEN;
7272

73-
PS(mod_user_is_open) = 0;
73+
PS(mod_user_is_open) = false;
7474

7575
zend_try {
7676
ret = PS(default_mod)->s_close(&PS(mod_data));

0 commit comments

Comments
 (0)