Skip to content

Commit b0961f2

Browse files
nikicnikic
committed
Remove uses of TRUE/FALSE in mysqli/pdo_mysql
Replace with standard uses of true/false.
1 parent b55793e commit b0961f2

File tree

9 files changed

+43
-51
lines changed

9 files changed

+43
-51
lines changed

‎ext/mysqli/mysqli.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type)
154154
void php_clear_stmt_bind(MY_STMT *stmt)
155155
{
156156
if (stmt->stmt) {
157-
if (mysqli_stmt_close(stmt->stmt, TRUE)) {
157+
if (mysqli_stmt_close(stmt->stmt, true)) {
158158
php_error_docref(NULL, E_WARNING, "Error occurred while closing statement");
159159
return;
160160
}
@@ -519,7 +519,7 @@ static PHP_GINIT_FUNCTION(mysqli)
519519
mysqli_globals->report_mode = MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT;;
520520
mysqli_globals->allow_local_infile = 0;
521521
mysqli_globals->local_infile_directory = NULL;
522-
mysqli_globals->rollback_on_cached_plink = FALSE;
522+
mysqli_globals->rollback_on_cached_plink = false;
523523
}
524524
/* }}} */
525525

‎ext/mysqli/mysqli_api.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ mysqli_escape_string_for_tx_name_in_comment(const char * const name)
7171
{
7272
char * ret = NULL;
7373
if (name) {
74-
bool warned = FALSE;
74+
bool warned = false;
7575
const char * p_orig = name;
7676
char * p_copy;
7777
p_copy = ret = emalloc(strlen(name) + 1 + 2 + 2 + 1); /* space, open, close, NullS */
@@ -92,9 +92,9 @@ mysqli_escape_string_for_tx_name_in_comment(const char * const name)
9292
v == '=')
9393
{
9494
*p_copy++ = v;
95-
} else if (warned == FALSE) {
95+
} else if (!warned) {
9696
php_error_docref(NULL, E_WARNING, "Transaction name has been truncated, since it can only contain the A-Z, a-z, 0-9, \"\\\", \"-\", \"_\", and \"=\" characters");
97-
warned = TRUE;
97+
warned = true;
9898
}
9999
++p_orig;
100100
}
@@ -585,7 +585,7 @@ PHP_FUNCTION(mysqli_change_user)
585585
#endif
586586

587587
#ifdef MYSQLI_USE_MYSQLND
588-
rc = mysqlnd_change_user_ex(mysql->mysql, user, password, dbname, FALSE, (size_t) password_len);
588+
rc = mysqlnd_change_user_ex(mysql->mysql, user, password, dbname, false, (size_t) password_len);
589589
#else
590590
rc = mysql_change_user(mysql->mysql, user, password, dbname);
591591
#endif
@@ -644,7 +644,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status)
644644

645645
if (MyG(rollback_on_cached_plink) &&
646646
#ifndef MYSQLI_USE_MYSQLND
647-
mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, TRANS_COR_NO_OPT, NULL))
647+
mysqli_commit_or_rollback_libmysql(mysql->mysql, false, TRANS_COR_NO_OPT, NULL))
648648
#else
649649
FAIL == mysqlnd_rollback(mysql->mysql, TRANS_COR_NO_OPT, NULL))
650650
#endif
@@ -657,7 +657,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status)
657657
MyG(num_active_persistent)--;
658658
}
659659
}
660-
mysql->persistent = FALSE;
660+
mysql->persistent = false;
661661
}
662662
mysql->mysql = NULL;
663663

@@ -701,7 +701,7 @@ PHP_FUNCTION(mysqli_commit)
701701
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
702702

703703
#ifndef MYSQLI_USE_MYSQLND
704-
if (mysqli_commit_or_rollback_libmysql(mysql->mysql, TRUE, flags, name)) {
704+
if (mysqli_commit_or_rollback_libmysql(mysql->mysql, true, flags, name)) {
705705
#else
706706
if (FAIL == mysqlnd_commit(mysql->mysql, flags, name)) {
707707
#endif
@@ -1108,9 +1108,9 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS)
11081108

11091109
if (FAIL == mysqlnd_stmt_fetch(stmt->stmt, &fetched_anything)) {
11101110
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
1111-
RETURN_BOOL(FALSE);
1112-
} else if (fetched_anything == TRUE) {
1113-
RETURN_BOOL(TRUE);
1111+
RETURN_FALSE;
1112+
} else if (fetched_anything) {
1113+
RETURN_TRUE;
11141114
} else {
11151115
RETURN_NULL();
11161116
}
@@ -1351,7 +1351,7 @@ PHP_FUNCTION(mysqli_free_result)
13511351
}
13521352
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
13531353

1354-
mysqli_free_result(result, FALSE);
1354+
mysqli_free_result(result, false);
13551355
MYSQLI_CLEAR_RESOURCE(mysql_result);
13561356
}
13571357
/* }}} */
@@ -1494,7 +1494,7 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, bool is_method)
14941494
We create always persistent, as if the user want to connect
14951495
to p:somehost, we can't convert the handle then
14961496
*/
1497-
if (!(mysql->mysql = mysqlnd_init(MYSQLND_CLIENT_NO_FLAG, TRUE)))
1497+
if (!(mysql->mysql = mysqlnd_init(MYSQLND_CLIENT_NO_FLAG, true)))
14981498
#endif
14991499
{
15001500
efree(mysql);
@@ -1516,7 +1516,7 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, bool is_method)
15161516
/* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */
15171517
PHP_FUNCTION(mysqli_init)
15181518
{
1519-
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE);
1519+
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, false);
15201520
}
15211521
/* }}} */
15221522

@@ -1849,7 +1849,7 @@ PHP_FUNCTION(mysqli_prepare)
18491849
mysql->mysql->data->error_info->error_list.tail = NULL;
18501850
mysql->mysql->data->error_info->error_list.count = 0;
18511851
#endif
1852-
mysqli_stmt_close(stmt->stmt, FALSE);
1852+
mysqli_stmt_close(stmt->stmt, false);
18531853
stmt->stmt = NULL;
18541854

18551855
/* restore error messages */
@@ -1894,7 +1894,7 @@ PHP_FUNCTION(mysqli_prepare)
18941894
/* {{{ Open a connection to a mysql server */
18951895
PHP_FUNCTION(mysqli_real_connect)
18961896
{
1897-
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE);
1897+
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, true, false);
18981898
}
18991899
/* }}} */
19001900

@@ -1967,7 +1967,7 @@ PHP_FUNCTION(mysqli_rollback)
19671967
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
19681968

19691969
#ifndef MYSQLI_USE_MYSQLND
1970-
if (mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, flags, name)) {
1970+
if (mysqli_commit_or_rollback_libmysql(mysql->mysql, false, flags, name)) {
19711971
#else
19721972
if (FAIL == mysqlnd_rollback(mysql->mysql, flags, name)) {
19731973
#endif
@@ -2036,7 +2036,7 @@ PHP_FUNCTION(mysqli_stmt_close)
20362036
}
20372037
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
20382038

2039-
mysqli_stmt_close(stmt->stmt, FALSE);
2039+
mysqli_stmt_close(stmt->stmt, false);
20402040
stmt->stmt = NULL;
20412041
php_clear_stmt_bind(stmt);
20422042
MYSQLI_CLEAR_RESOURCE(mysql_stmt);

‎ext/mysqli/mysqli_mysqlnd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@
3939
#define mysqli_stmt_close(c, implicit) mysqlnd_stmt_close((c), (implicit))
4040
#define mysqli_free_result(r, implicit) mysqlnd_free_result((r), (implicit))
4141
#define mysqli_async_query(c, q, l) mysqlnd_async_query((c), (q), (l))
42-
#define mysqli_change_user_silent(c, u, p, d, p_len) mysqlnd_change_user_ex((c), (u), (p), (d), TRUE, (size_t)(p_len))
42+
#define mysqli_change_user_silent(c, u, p, d, p_len) mysqlnd_change_user_ex((c), (u), (p), (d), true, (size_t)(p_len))
4343

4444
#endif

‎ext/mysqli/mysqli_nonapi.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
5656
*ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL,
5757
*ssl_cipher = NULL;
5858
size_t hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
59-
bool persistent = FALSE, ssl = FALSE;
59+
bool persistent = false, ssl = false;
6060
zend_long port = 0, flags = 0;
6161
bool port_is_null = 1;
6262
zend_string *hash_key = NULL;
63-
bool new_connection = FALSE;
63+
bool new_connection = false;
6464
zend_resource *le;
6565
mysqli_plist_entry *plist = NULL;
6666
bool self_alloced = 0;
@@ -148,7 +148,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
148148
if (!MyG(allow_persistent)) {
149149
php_error_docref(NULL, E_WARNING, "Persistent connections are disabled. Downgrading to normal");
150150
} else {
151-
mysql->persistent = persistent = TRUE;
151+
mysql->persistent = persistent = true;
152152

153153
hash_key = strpprintf(0, "mysqli_%s_%s" ZEND_LONG_FMT "%s%s%s", SAFE_STR(hostname), SAFE_STR(socket),
154154
port, SAFE_STR(username), SAFE_STR(dbname),
@@ -192,7 +192,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
192192
#ifdef MYSQLI_USE_MYSQLND
193193
if (mysql->mysql->data->vio->data->ssl) {
194194
/* copy over pre-existing ssl settings so we can reuse them when reconnecting */
195-
ssl = TRUE;
195+
ssl = true;
196196

197197
ssl_key = mysql->mysql->data->vio->data->options.ssl_key ? estrdup(mysql->mysql->data->vio->data->options.ssl_key) : NULL;
198198
ssl_cert = mysql->mysql->data->vio->data->options.ssl_cert ? estrdup(mysql->mysql->data->vio->data->options.ssl_cert) : NULL;
@@ -207,7 +207,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
207207
|| mysql->mysql->options.ssl_capath
208208
|| mysql->mysql->options.ssl_cipher) {
209209
/* copy over pre-existing ssl settings so we can reuse them when reconnecting */
210-
ssl = TRUE;
210+
ssl = true;
211211

212212
ssl_key = mysql->mysql->options.ssl_key ? estrdup(mysql->mysql->options.ssl_key) : NULL;
213213
ssl_cert = mysql->mysql->options.ssl_cert ? estrdup(mysql->mysql->options.ssl_cert) : NULL;
@@ -250,7 +250,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
250250
#endif
251251
goto err;
252252
}
253-
new_connection = TRUE;
253+
new_connection = true;
254254
}
255255

256256
#ifndef MYSQLI_USE_MYSQLND
@@ -371,7 +371,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
371371
if (mysql->hash_key) {
372372
zend_string_release_ex(mysql->hash_key, 0);
373373
mysql->hash_key = NULL;
374-
mysql->persistent = FALSE;
374+
mysql->persistent = false;
375375
}
376376
if (!is_real_connect && self_alloced) {
377377
efree(mysql);
@@ -382,19 +382,19 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
382382
/* {{{ Open a connection to a mysql server */
383383
PHP_FUNCTION(mysqli_connect)
384384
{
385-
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, FALSE);
385+
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, false, false);
386386
}
387387
/* }}} */
388388

389389
PHP_METHOD(mysqli, __construct)
390390
{
391-
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, TRUE);
391+
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, false, true);
392392
}
393393

394394
/* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */
395395
PHP_METHOD(mysqli, init)
396396
{
397-
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE);
397+
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, true);
398398
}
399399
/* }}} */
400400

@@ -1273,7 +1273,7 @@ PHP_FUNCTION(mysqli_savepoint)
12731273
}
12741274

12751275
#ifndef MYSQLI_USE_MYSQLND
1276-
if (mysqli_savepoint_libmysql(mysql->mysql, name, FALSE)) {
1276+
if (mysqli_savepoint_libmysql(mysql->mysql, name, false)) {
12771277
#else
12781278
if (FAIL == mysqlnd_savepoint(mysql->mysql, name)) {
12791279
#endif
@@ -1300,7 +1300,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
13001300
RETURN_THROWS();
13011301
}
13021302
#ifndef MYSQLI_USE_MYSQLND
1303-
if (mysqli_savepoint_libmysql(mysql->mysql, name, TRUE)) {
1303+
if (mysqli_savepoint_libmysql(mysql->mysql, name, true)) {
13041304
#else
13051305
if (FAIL == mysqlnd_release_savepoint(mysql->mysql, name)) {
13061306
#endif

‎ext/mysqli/php_mysqli_structs.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@
2626
#undef LIST
2727
#endif
2828

29-
#ifndef TRUE
30-
#define TRUE 1
31-
#endif
32-
33-
#ifndef FALSE
34-
#define FALSE 0
35-
#endif
36-
3729
#ifdef MYSQLI_USE_MYSQLND
3830
#include "ext/mysqlnd/mysqlnd.h"
3931
#include "mysqli_mysqlnd.h"

‎ext/mysqlnd/mysqlnd.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ PHPAPI void mysqlnd_plugin_apply_with_argument(apply_func_arg_t apply_func, void
6969
#define mysqlnd_restart_psession(conn) ((conn)->data)->m->restart_psession((conn)->data)
7070
#define mysqlnd_end_psession(conn) ((conn)->data)->m->end_psession((conn)->data)
7171
PHPAPI void mysqlnd_minfo_print_hash(zval *values);
72-
#define mysqlnd_thread_safe() TRUE
72+
#define mysqlnd_thread_safe() true
7373

7474
PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_nr(const unsigned int charsetno);
7575
PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_name(const char * const charsetname);
@@ -185,8 +185,8 @@ PHPAPI void mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn);
185185
/* Simple commands */
186186
#define mysqlnd_autocommit(conn, mode) ((conn)->data)->m->set_autocommit((conn)->data, (mode))
187187
#define mysqlnd_begin_transaction(conn,flags,name) ((conn)->data)->m->tx_begin((conn)->data, (flags), (name))
188-
#define mysqlnd_commit(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, TRUE, (flags), (name))
189-
#define mysqlnd_rollback(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, FALSE, (flags), (name))
188+
#define mysqlnd_commit(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, true, (flags), (name))
189+
#define mysqlnd_rollback(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, false, (flags), (name))
190190
#define mysqlnd_savepoint(conn, name) ((conn)->data)->m->tx_savepoint((conn)->data, (name))
191191
#define mysqlnd_release_savepoint(conn, name) ((conn)->data)->m->tx_savepoint_release((conn)->data, (name))
192192
#define mysqlnd_list_dbs(conn, wild) ((conn)->data)->m->list_method((conn)->data, wild? "SHOW DATABASES LIKE %s":"SHOW DATABASES", (wild), NULL)

‎ext/mysqlnd/mysqlnd_libmysql_compat.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/* functions */
3838
#define mysql_affected_rows(r) mysqlnd_affected_rows((r))
3939
#define mysql_autocommit(r,m) mysqlnd_autocommit((r),(m))
40-
#define mysql_change_user(r,a,b,c) mysqlnd_change_user((r), (a), (b), (c), FALSE)
40+
#define mysql_change_user(r,a,b,c) mysqlnd_change_user((r), (a), (b), (c), false)
4141
#define mysql_character_set_name(c) mysqlnd_character_set_name((c))
4242
#define mysql_close(r) mysqlnd_close((r), MYSQLND_CLOSE_EXPLICIT)
4343
#define mysql_commit(r) mysqlnd_commit((r), TRANS_COR_NO_OPT, NULL)
@@ -104,7 +104,7 @@
104104
#define mysql_options(c,a,v) mysqlnd_options((c), (a), (v))
105105
#define mysql_options4(c,a,k,v) mysqlnd_options4((c), (a), (k), (v))
106106
#define mysql_stmt_init(r) mysqlnd_stmt_init((r))
107-
#define mysql_free_result(r) mysqlnd_free_result((r), FALSE)
107+
#define mysql_free_result(r) mysqlnd_free_result((r), false)
108108
#define mysql_store_result(r) mysqlnd_store_result((r))
109109
#define mysql_use_result(r) mysqlnd_use_result((r))
110110
#define mysql_async_store_result(r) mysqlnd_async_store_result((r))

‎ext/pdo_mysql/mysql_statement.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori
562562
PDO_DBG_ENTER("pdo_mysql_stmt_fetch");
563563
PDO_DBG_INF_FMT("stmt=%p", S->stmt);
564564
if (S->stmt) {
565-
if (FAIL == mysqlnd_stmt_fetch(S->stmt, &fetched_anything) || fetched_anything == FALSE) {
565+
if (FAIL == mysqlnd_stmt_fetch(S->stmt, &fetched_anything) || !fetched_anything) {
566566
pdo_mysql_error_stmt(stmt);
567567
PDO_DBG_RETURN(0);
568568
}

‎ext/pdo_mysql/php_pdo_mysql_int.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ typedef _Bool my_bool;
3434
#if defined(PDO_USE_MYSQLND) && PHP_DEBUG && !defined(PHP_WIN32)
3535
#define PDO_DBG_ENABLED 1
3636

37-
#define PDO_DBG_INF(msg) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0)
38-
#define PDO_DBG_ERR(msg) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0)
39-
#define PDO_DBG_INF_FMT(...) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log_va(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "info : ", __VA_ARGS__); } while (0)
40-
#define PDO_DBG_ERR_FMT(...) do { if (dbg_skip_trace == FALSE) PDO_MYSQL_G(dbg)->m->log_va(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "error: ", __VA_ARGS__); } while (0)
37+
#define PDO_DBG_INF(msg) do { if (!dbg_skip_trace) PDO_MYSQL_G(dbg)->m->log(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0)
38+
#define PDO_DBG_ERR(msg) do { if (!dbg_skip_trace) PDO_MYSQL_G(dbg)->m->log(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0)
39+
#define PDO_DBG_INF_FMT(...) do { if (!dbg_skip_trace) PDO_MYSQL_G(dbg)->m->log_va(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "info : ", __VA_ARGS__); } while (0)
40+
#define PDO_DBG_ERR_FMT(...) do { if (!dbg_skip_trace) PDO_MYSQL_G(dbg)->m->log_va(PDO_MYSQL_G(dbg), __LINE__, __FILE__, -1, "error: ", __VA_ARGS__); } while (0)
4141
#define PDO_DBG_ENTER(func_name) \
42-
bool dbg_skip_trace = TRUE; \
42+
bool dbg_skip_trace = true; \
4343
((void) dbg_skip_trace); \
4444
if (PDO_MYSQL_G(dbg)) \
4545
dbg_skip_trace = !PDO_MYSQL_G(dbg)->m->func_enter(PDO_MYSQL_G(dbg), __LINE__, __FILE__, func_name, strlen(func_name));

0 commit comments

Comments
 (0)