Skip to content

Commit 7ebdd7d

Browse files
petkpetk
authored
Trim trailing whitespace (php#15649)
[skip ci]
1 parent b366170 commit 7ebdd7d

6 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎docs/release-process.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ slightly different steps. We'll call attention where the steps differ.
248248
```shell
249249
git add -p
250250
git commit --gpg-sign=YOURKEYID -m "[ci skip] Update NEWS for PHP X.Y.Z alpha2"
251-
```
251+
```
252252
253253
🔷 **For post-GA releases only,** switch back to the *version branch* for
254254
your release (e.g., `PHP-8.2`) and bump the version numbers in

‎ext/dom/parentnode/css_selectors.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static lxb_css_selector_list_t *dom_parse_selector(
103103
php_dom_throw_error_with_message(SYNTAX_ERR, "Invalid selector", true);
104104
}
105105
}
106-
106+
107107
return list;
108108
}
109109

‎ext/pdo_firebird/firebird_driver.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ static int php_firebird_preprocess(const zend_string* sql, char* sql_out, HashTa
465465
/* set coercing a data type */
466466
static void set_coercing_output_data_types(XSQLDA* sqlda)
467467
{
468-
/* Data types introduced in Firebird 4.0 are difficult to process using the Firebird Legacy API. */
468+
/* Data types introduced in Firebird 4.0 are difficult to process using the Firebird Legacy API. */
469469
/* These data types include DECFLOAT(16), DECFLOAT(34), INT128 (NUMERIC/DECIMAL(38, x)). */
470470
/* In any case, at this data types can only be mapped to strings. */
471471
/* This function allows you to ensure minimal performance of queries if they contain columns of the above types. */
@@ -477,7 +477,7 @@ static void set_coercing_output_data_types(XSQLDA* sqlda)
477477
unsigned fb_client_major_version = (fb_client_version >> 8) & 0xFF;
478478
for (i=0, var = sqlda->sqlvar; i < sqlda->sqld; i++, var++) {
479479
dtype = (var->sqltype & ~1); /* drop flag bit */
480-
nullable = (var->sqltype & 1);
480+
nullable = (var->sqltype & 1);
481481
switch(dtype) {
482482
case SQL_INT128:
483483
var->sqltype = SQL_VARYING + nullable;
@@ -497,7 +497,7 @@ static void set_coercing_output_data_types(XSQLDA* sqlda)
497497

498498
case SQL_TIMESTAMP_TZ:
499499
if (fb_client_major_version < 4) {
500-
/* If the client version is below 4.0, then it is impossible to handle time zones natively, */
500+
/* If the client version is below 4.0, then it is impossible to handle time zones natively, */
501501
/* so we convert these types to a string. */
502502
var->sqltype = SQL_VARYING + nullable;
503503
var->sqllen = 58;
@@ -506,8 +506,8 @@ static void set_coercing_output_data_types(XSQLDA* sqlda)
506506

507507
case SQL_TIME_TZ:
508508
if (fb_client_major_version < 4) {
509-
/* If the client version is below 4.0, then it is impossible to handle time zones natively, */
510-
/* so we convert these types to a string. */
509+
/* If the client version is below 4.0, then it is impossible to handle time zones natively, */
510+
/* so we convert these types to a string. */
511511
var->sqltype = SQL_VARYING + nullable;
512512
var->sqllen = 46;
513513
}
@@ -516,7 +516,7 @@ static void set_coercing_output_data_types(XSQLDA* sqlda)
516516
default:
517517
break;
518518
}
519-
}
519+
}
520520
}
521521
#endif
522522

‎ext/pdo_firebird/firebird_statement.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static int get_formatted_time_tz(pdo_stmt_t *stmt, const ISC_TIME_TZ* timeTz, zv
8484
unsigned hours = 0, minutes = 0, seconds = 0, fractions = 0;
8585
char timeZoneBuffer[40] = {0};
8686
char *fmt;
87-
struct tm t;
87+
struct tm t;
8888
ISC_TIME time;
8989
char timeBuf[80] = {0};
9090
char timeTzBuf[124] = {0};
@@ -94,7 +94,7 @@ static int get_formatted_time_tz(pdo_stmt_t *stmt, const ISC_TIME_TZ* timeTz, zv
9494
time = fb_encode_time(hours, minutes, seconds, fractions);
9595
isc_decode_sql_time(&time, &t);
9696
fmt = S->H->time_format ? S->H->time_format : PDO_FB_DEF_TIME_FMT;
97-
97+
9898
size_t len = strftime(timeBuf, sizeof(timeBuf), fmt, &t);
9999
if (len == 0) {
100100
return 1;
@@ -112,7 +112,7 @@ static int get_formatted_timestamp_tz(pdo_stmt_t *stmt, const ISC_TIMESTAMP_TZ*
112112
unsigned year, month, day, hours, minutes, seconds, fractions;
113113
char timeZoneBuffer[40] = {0};
114114
char *fmt;
115-
struct tm t;
115+
struct tm t;
116116
ISC_TIMESTAMP ts;
117117
char timestampBuf[80] = {0};
118118
char timestampTzBuf[124] = {0};
@@ -124,7 +124,7 @@ static int get_formatted_timestamp_tz(pdo_stmt_t *stmt, const ISC_TIMESTAMP_TZ*
124124
isc_decode_timestamp(&ts, &t);
125125

126126
fmt = S->H->timestamp_format ? S->H->timestamp_format : PDO_FB_DEF_TIMESTAMP_FMT;
127-
127+
128128
size_t len = strftime(timestampBuf, sizeof(timestampBuf), fmt, &t);
129129
if (len == 0) {
130130
return 1;
@@ -563,7 +563,7 @@ static int pdo_firebird_stmt_get_col(
563563
size_t len = strftime(buf, sizeof(buf), fmt, &t);
564564
ZVAL_STRINGL(result, buf, len);
565565
break;
566-
#if FB_API_VER >= 40
566+
#if FB_API_VER >= 40
567567
case SQL_TIME_TZ: {
568568
ISC_TIME_TZ time = php_get_isc_time_tz_from_sqldata(var->sqldata);
569569
return get_formatted_time_tz(stmt, &time, result);
@@ -572,7 +572,7 @@ static int pdo_firebird_stmt_get_col(
572572
ISC_TIMESTAMP_TZ ts = php_get_isc_timestamp_tz_from_sqldata(var->sqldata);
573573
return get_formatted_timestamp_tz(stmt, &ts, result);
574574
}
575-
#endif
575+
#endif
576576
case SQL_BLOB: {
577577
ISC_QUAD quad = php_get_isc_quad_from_sqldata(var->sqldata);
578578
return php_firebird_fetch_blob(stmt, colno, result, &quad);

‎ext/pdo_firebird/pdo_firebird_utils.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" unsigned fb_get_client_version(void)
3333
{
3434
Firebird::IMaster* master = Firebird::fb_get_master_interface();
3535
Firebird::IUtil* util = master->getUtilInterface();
36-
return util->getClientVersion();
36+
return util->getClientVersion();
3737
}
3838

3939
extern "C" ISC_TIME fb_encode_time(unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions)
@@ -53,7 +53,7 @@ extern "C" ISC_DATE fb_encode_date(unsigned year, unsigned month, unsigned day)
5353
#if FB_API_VER >= 40
5454

5555
/* Decodes a time with time zone into its time components. */
56-
extern "C" ISC_STATUS fb_decode_time_tz(ISC_STATUS* isc_status, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
56+
extern "C" ISC_STATUS fb_decode_time_tz(ISC_STATUS* isc_status, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
5757
unsigned timeZoneBufferLength, char* timeZoneBuffer)
5858
{
5959
Firebird::IMaster* master = Firebird::fb_get_master_interface();
@@ -70,9 +70,9 @@ extern "C" ISC_STATUS fb_decode_time_tz(ISC_STATUS* isc_status, const ISC_TIME_T
7070
}
7171

7272
/* Decodes a timestamp with time zone into its date and time components */
73-
extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_TIMESTAMP_TZ* timestampTz,
73+
extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_TIMESTAMP_TZ* timestampTz,
7474
unsigned* year, unsigned* month, unsigned* day,
75-
unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
75+
unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
7676
unsigned timeZoneBufferLength, char* timeZoneBuffer)
7777
{
7878
Firebird::IMaster* master = Firebird::fb_get_master_interface();

‎ext/pdo_firebird/pdo_firebird_utils.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ ISC_DATE fb_encode_date(unsigned year, unsigned month, unsigned day);
3131

3232
#if FB_API_VER >= 40
3333

34-
ISC_STATUS fb_decode_time_tz(ISC_STATUS* isc_status, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
34+
ISC_STATUS fb_decode_time_tz(ISC_STATUS* isc_status, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
3535
unsigned timeZoneBufferLength, char* timeZoneBuffer);
3636

37-
ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_TIMESTAMP_TZ* timestampTz,
37+
ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_TIMESTAMP_TZ* timestampTz,
3838
unsigned* year, unsigned* month, unsigned* day,
39-
unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
40-
unsigned timeZoneBufferLength, char* timeZoneBuffer);
39+
unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
40+
unsigned timeZoneBufferLength, char* timeZoneBuffer);
4141

4242
#endif
4343

0 commit comments

Comments
 (0)