From 7b16f81651d39d5c5a1059aacaa0b268aad07c88 Mon Sep 17 00:00:00 2001 From: Giovanni Giacobbi Date: Wed, 18 Mar 2026 13:05:50 +0100 Subject: [PATCH] ext/session: code cleanup - use tab for indent --- ext/session/mod_files.c | 4 ++-- ext/session/mod_user.c | 4 ++-- ext/session/session.c | 52 ++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 87bcb7e3690..73b10fc6d87 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -153,7 +153,7 @@ static void ps_files_open(ps_files *data, /* const */ zend_string *key) { char buf[MAXPATHLEN]; #if !defined(O_NOFOLLOW) || !defined(PHP_WIN32) - struct stat sbuf = {0}; + struct stat sbuf = {0}; #endif int ret; @@ -230,7 +230,7 @@ static zend_result ps_files_write(ps_files *data, zend_string *key, zend_string /* PS(id) may be changed by calling session_regenerate_id(). Re-initialization should be tried here. ps_files_open() checks - data->last_key and reopen when it is needed. */ + data->last_key and reopen when it is needed. */ ps_files_open(data, key); if (data->fd < 0) { return FAILURE; diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index 90b91926a62..3eec3d7fa4b 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -75,8 +75,8 @@ static zend_result verify_bool_return_type_userland_calls(const zval* value) } if (!EG(exception)) { zend_type_error("Session callback must have a return value of type bool, %s returned", zend_zval_value_name(value)); \ - } - return FAILURE; + } + return FAILURE; } PS_OPEN_FUNC(user) diff --git a/ext/session/session.c b/ext/session/session.c index e790fa074d6..47ca109a14d 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -267,7 +267,7 @@ static void php_session_track_init(void) static zend_string *php_session_encode(void) { IF_SESSION_VARS() { - ZEND_ASSERT(PS(serializer)); + ZEND_ASSERT(PS(serializer)); return PS(serializer)->encode(); } else { php_error_docref(NULL, E_WARNING, "Cannot encode non-existent session"); @@ -284,7 +284,7 @@ static ZEND_COLD void php_session_cancel_decode(void) static zend_result php_session_decode(const zend_string *data) { - ZEND_ASSERT(PS(serializer)); + ZEND_ASSERT(PS(serializer)); zend_result result = SUCCESS; zend_try { if (PS(serializer)->decode(ZSTR_VAL(data), ZSTR_LEN(data)) == FAILURE) { @@ -786,38 +786,38 @@ static PHP_INI_MH(OnUpdateSidBits) static PHP_INI_MH(OnUpdateSessionGcProbability) { - SESSION_CHECK_ACTIVE_STATE; - SESSION_CHECK_OUTPUT_STATE; + SESSION_CHECK_ACTIVE_STATE; + SESSION_CHECK_OUTPUT_STATE; - zend_long tmp = zend_ini_parse_quantity_warn(new_value, entry->name); + zend_long tmp = zend_ini_parse_quantity_warn(new_value, entry->name); - if (tmp < 0) { - php_error_docref("session.gc_probability", E_WARNING, "session.gc_probability must be greater than or equal to 0"); - return FAILURE; - } + if (tmp < 0) { + php_error_docref("session.gc_probability", E_WARNING, "session.gc_probability must be greater than or equal to 0"); + return FAILURE; + } - zend_long *p = ZEND_INI_GET_ADDR(); - *p = tmp; + zend_long *p = ZEND_INI_GET_ADDR(); + *p = tmp; - return SUCCESS; + return SUCCESS; } static PHP_INI_MH(OnUpdateSessionDivisor) { - SESSION_CHECK_ACTIVE_STATE; - SESSION_CHECK_OUTPUT_STATE; + SESSION_CHECK_ACTIVE_STATE; + SESSION_CHECK_OUTPUT_STATE; - zend_long tmp = zend_ini_parse_quantity_warn(new_value, entry->name); + zend_long tmp = zend_ini_parse_quantity_warn(new_value, entry->name); - if (tmp <= 0) { - php_error_docref("session.gc_divisor", E_WARNING, "session.gc_divisor must be greater than 0"); - return FAILURE; - } + if (tmp <= 0) { + php_error_docref("session.gc_divisor", E_WARNING, "session.gc_divisor must be greater than 0"); + return FAILURE; + } - zend_long *p = ZEND_INI_GET_ADDR(); - *p = tmp; + zend_long *p = ZEND_INI_GET_ADDR(); + *p = tmp; - return SUCCESS; + return SUCCESS; } static PHP_INI_MH(OnUpdateRfc1867Freq) @@ -2399,10 +2399,10 @@ PHP_FUNCTION(session_create_id) } if (prefix && ZSTR_LEN(prefix)) { - if (ZSTR_LEN(prefix) > PS_MAX_SID_LENGTH) { - zend_argument_value_error(1, "cannot be longer than %d characters", PS_MAX_SID_LENGTH); - RETURN_THROWS(); - } + if (ZSTR_LEN(prefix) > PS_MAX_SID_LENGTH) { + zend_argument_value_error(1, "cannot be longer than %d characters", PS_MAX_SID_LENGTH); + RETURN_THROWS(); + } if (php_session_valid_key(ZSTR_VAL(prefix)) == FAILURE) { /* E_ERROR raised for security reason. */ php_error_docref(NULL, E_WARNING, "Prefix cannot contain special characters. Only the A-Z, a-z, 0-9, \"-\", and \",\" characters are allowed");