VladPolskiy/php-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove uses of TRUE/FALSE in mysqli/pdo_mysql

Browse Source 
Replace with standard uses of true/false.
This commit is contained in:
Nikita Popov
2021-05-26 15:07:23 +02:00
parent b55793e45b
commit b0961f2d04
9 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/mysqli/mysqli.c
View File

@ -154,7 +154,7 @@ void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type)
void php_clear_stmt_bind(MY_STMT *stmt)
{
if (stmt->stmt) {
if (mysqli_stmt_close(stmt->stmt, TRUE)) {
if (mysqli_stmt_close(stmt->stmt, true)) {
php_error_docref(NULL, E_WARNING, "Error occurred while closing statement");
return;
}
@ -519,7 +519,7 @@ static PHP_GINIT_FUNCTION(mysqli)
mysqli_globals->report_mode = MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT;;
mysqli_globals->allow_local_infile = 0;
mysqli_globals->local_infile_directory = NULL;
mysqli_globals->rollback_on_cached_plink = FALSE;
mysqli_globals->rollback_on_cached_plink = false;
}
/* }}} */

34
ext/mysqli/mysqli_api.c
View File

@ -71,7 +71,7 @@ mysqli_escape_string_for_tx_name_in_comment(const char * const name)
{
char * ret = NULL;
if (name) {
bool warned = FALSE;
bool warned = false;
const char * p_orig = name;
char * p_copy;
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)
v == '=')
{
*p_copy++ = v;
} else if (warned == FALSE) {
} else if (!warned) {
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");
warned = TRUE;
warned = true;
}
++p_orig;
}
@ -585,7 +585,7 @@ PHP_FUNCTION(mysqli_change_user)
#endif
#ifdef MYSQLI_USE_MYSQLND
rc = mysqlnd_change_user_ex(mysql->mysql, user, password, dbname, FALSE, (size_t) password_len);
rc = mysqlnd_change_user_ex(mysql->mysql, user, password, dbname, false, (size_t) password_len);
#else
rc = mysql_change_user(mysql->mysql, user, password, dbname);
#endif
@ -644,7 +644,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status)
if (MyG(rollback_on_cached_plink) &&
#ifndef MYSQLI_USE_MYSQLND
mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, TRANS_COR_NO_OPT, NULL))
mysqli_commit_or_rollback_libmysql(mysql->mysql, false, TRANS_COR_NO_OPT, NULL))
#else
FAIL == mysqlnd_rollback(mysql->mysql, TRANS_COR_NO_OPT, NULL))
#endif
@ -657,7 +657,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status)
MyG(num_active_persistent)--;
}
}
mysql->persistent = FALSE;
mysql->persistent = false;
}
mysql->mysql = NULL;
@ -701,7 +701,7 @@ PHP_FUNCTION(mysqli_commit)
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
#ifndef MYSQLI_USE_MYSQLND
if (mysqli_commit_or_rollback_libmysql(mysql->mysql, TRUE, flags, name)) {
if (mysqli_commit_or_rollback_libmysql(mysql->mysql, true, flags, name)) {
#else
if (FAIL == mysqlnd_commit(mysql->mysql, flags, name)) {
#endif
@ -1108,9 +1108,9 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS)
if (FAIL == mysqlnd_stmt_fetch(stmt->stmt, &fetched_anything)) {
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
RETURN_BOOL(FALSE);
} else if (fetched_anything == TRUE) {
RETURN_BOOL(TRUE);
RETURN_FALSE;
} else if (fetched_anything) {
RETURN_TRUE;
} else {
RETURN_NULL();
}
@ -1351,7 +1351,7 @@ PHP_FUNCTION(mysqli_free_result)
}
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
mysqli_free_result(result, FALSE);
mysqli_free_result(result, false);
MYSQLI_CLEAR_RESOURCE(mysql_result);
}
/* }}} */
@ -1494,7 +1494,7 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, bool is_method)
We create always persistent, as if the user want to connect
to p:somehost, we can't convert the handle then
*/
if (!(mysql->mysql = mysqlnd_init(MYSQLND_CLIENT_NO_FLAG, TRUE)))
if (!(mysql->mysql = mysqlnd_init(MYSQLND_CLIENT_NO_FLAG, true)))
#endif
{
efree(mysql);
@ -1516,7 +1516,7 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, bool is_method)
/* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */
PHP_FUNCTION(mysqli_init)
{
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE);
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, false);
}
/* }}} */
@ -1849,7 +1849,7 @@ PHP_FUNCTION(mysqli_prepare)
mysql->mysql->data->error_info->error_list.tail = NULL;
mysql->mysql->data->error_info->error_list.count = 0;
#endif
mysqli_stmt_close(stmt->stmt, FALSE);
mysqli_stmt_close(stmt->stmt, false);
stmt->stmt = NULL;
/* restore error messages */
@ -1894,7 +1894,7 @@ PHP_FUNCTION(mysqli_prepare)
/* {{{ Open a connection to a mysql server */
PHP_FUNCTION(mysqli_real_connect)
{
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE);
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, true, false);
}
/* }}} */
@ -1967,7 +1967,7 @@ PHP_FUNCTION(mysqli_rollback)
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
#ifndef MYSQLI_USE_MYSQLND
if (mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, flags, name)) {
if (mysqli_commit_or_rollback_libmysql(mysql->mysql, false, flags, name)) {
#else
if (FAIL == mysqlnd_rollback(mysql->mysql, flags, name)) {
#endif
@ -2036,7 +2036,7 @@ PHP_FUNCTION(mysqli_stmt_close)
}
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
mysqli_stmt_close(stmt->stmt, FALSE);
mysqli_stmt_close(stmt->stmt, false);
stmt->stmt = NULL;
php_clear_stmt_bind(stmt);
MYSQLI_CLEAR_RESOURCE(mysql_stmt);

2
ext/mysqli/mysqli_mysqlnd.h
View File

@ -39,6 +39,6 @@
#define mysqli_stmt_close(c, implicit) mysqlnd_stmt_close((c), (implicit))
#define mysqli_free_result(r, implicit) mysqlnd_free_result((r), (implicit))
#define mysqli_async_query(c, q, l) mysqlnd_async_query((c), (q), (l))
#define mysqli_change_user_silent(c, u, p, d, p_len) mysqlnd_change_user_ex((c), (u), (p), (d), TRUE, (size_t)(p_len))
#define mysqli_change_user_silent(c, u, p, d, p_len) mysqlnd_change_user_ex((c), (u), (p), (d), true, (size_t)(p_len))
#endif

24
ext/mysqli/mysqli_nonapi.c
View File

@ -56,11 +56,11 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
*ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL,
*ssl_cipher = NULL;
size_t hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
bool persistent = FALSE, ssl = FALSE;
bool persistent = false, ssl = false;
zend_long port = 0, flags = 0;
bool port_is_null = 1;
zend_string *hash_key = NULL;
bool new_connection = FALSE;
bool new_connection = false;
zend_resource *le;
mysqli_plist_entry *plist = NULL;
bool self_alloced = 0;
@ -148,7 +148,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
if (!MyG(allow_persistent)) {
php_error_docref(NULL, E_WARNING, "Persistent connections are disabled. Downgrading to normal");
} else {
mysql->persistent = persistent = TRUE;
mysql->persistent = persistent = true;
hash_key = strpprintf(0, "mysqli_%s_%s" ZEND_LONG_FMT "%s%s%s", SAFE_STR(hostname), SAFE_STR(socket),
port, SAFE_STR(username), SAFE_STR(dbname),
@ -192,7 +192,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
#ifdef MYSQLI_USE_MYSQLND
if (mysql->mysql->data->vio->data->ssl) {
/* copy over pre-existing ssl settings so we can reuse them when reconnecting */
ssl = TRUE;
ssl = true;
ssl_key = mysql->mysql->data->vio->data->options.ssl_key ? estrdup(mysql->mysql->data->vio->data->options.ssl_key) : NULL;
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
|| mysql->mysql->options.ssl_capath
|| mysql->mysql->options.ssl_cipher) {
/* copy over pre-existing ssl settings so we can reuse them when reconnecting */
ssl = TRUE;
ssl = true;
ssl_key = mysql->mysql->options.ssl_key ? estrdup(mysql->mysql->options.ssl_key) : NULL;
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
#endif
goto err;
}
new_connection = TRUE;
new_connection = true;
}
#ifndef MYSQLI_USE_MYSQLND
@ -371,7 +371,7 @@ err:
if (mysql->hash_key) {
zend_string_release_ex(mysql->hash_key, 0);
mysql->hash_key = NULL;
mysql->persistent = FALSE;
mysql->persistent = false;
}
if (!is_real_connect && self_alloced) {
efree(mysql);
@ -382,19 +382,19 @@ err:
/* {{{ Open a connection to a mysql server */
PHP_FUNCTION(mysqli_connect)
{
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, FALSE);
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, false, false);
}
/* }}} */
PHP_METHOD(mysqli, __construct)
{
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, TRUE);
mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, false, true);
}
/* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */
PHP_METHOD(mysqli, init)
{
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE);
php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, true);
}
/* }}} */
@ -1273,7 +1273,7 @@ PHP_FUNCTION(mysqli_savepoint)
}
#ifndef MYSQLI_USE_MYSQLND
if (mysqli_savepoint_libmysql(mysql->mysql, name, FALSE)) {
if (mysqli_savepoint_libmysql(mysql->mysql, name, false)) {
#else
if (FAIL == mysqlnd_savepoint(mysql->mysql, name)) {
#endif
@ -1300,7 +1300,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
RETURN_THROWS();
}
#ifndef MYSQLI_USE_MYSQLND
if (mysqli_savepoint_libmysql(mysql->mysql, name, TRUE)) {
if (mysqli_savepoint_libmysql(mysql->mysql, name, true)) {
#else
if (FAIL == mysqlnd_release_savepoint(mysql->mysql, name)) {
#endif

8
ext/mysqli/php_mysqli_structs.h
View File

@ -26,14 +26,6 @@
#undef LIST
#endif
#ifndef TRUE
#define TRUE 1
#endif
#ifndef FALSE
#define FALSE 0
#endif
#ifdef MYSQLI_USE_MYSQLND
#include "ext/mysqlnd/mysqlnd.h"
#include "mysqli_mysqlnd.h"

6
ext/mysqlnd/mysqlnd.h
View File

@ -69,7 +69,7 @@ PHPAPI void mysqlnd_plugin_apply_with_argument(apply_func_arg_t apply_func, void
#define mysqlnd_restart_psession(conn) ((conn)->data)->m->restart_psession((conn)->data)
#define mysqlnd_end_psession(conn) ((conn)->data)->m->end_psession((conn)->data)
PHPAPI void mysqlnd_minfo_print_hash(zval *values);
#define mysqlnd_thread_safe() TRUE
#define mysqlnd_thread_safe() true
PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_nr(const unsigned int charsetno);
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);
/* Simple commands */
#define mysqlnd_autocommit(conn, mode) ((conn)->data)->m->set_autocommit((conn)->data, (mode))
#define mysqlnd_begin_transaction(conn,flags,name) ((conn)->data)->m->tx_begin((conn)->data, (flags), (name))
#define mysqlnd_commit(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, TRUE, (flags), (name))
#define mysqlnd_rollback(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, FALSE, (flags), (name))
#define mysqlnd_commit(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, true, (flags), (name))
#define mysqlnd_rollback(conn, flags, name) ((conn)->data)->m->tx_commit_or_rollback((conn)->data, false, (flags), (name))
#define mysqlnd_savepoint(conn, name) ((conn)->data)->m->tx_savepoint((conn)->data, (name))
#define mysqlnd_release_savepoint(conn, name) ((conn)->data)->m->tx_savepoint_release((conn)->data, (name))
#define mysqlnd_list_dbs(conn, wild) ((conn)->data)->m->list_method((conn)->data, wild? "SHOW DATABASES LIKE %s":"SHOW DATABASES", (wild), NULL)

4
ext/mysqlnd/mysqlnd_libmysql_compat.h
View File

@ -37,7 +37,7 @@
/* functions */
#define mysql_affected_rows(r) mysqlnd_affected_rows((r))
#define mysql_autocommit(r,m) mysqlnd_autocommit((r),(m))
#define mysql_change_user(r,a,b,c) mysqlnd_change_user((r), (a), (b), (c), FALSE)
#define mysql_change_user(r,a,b,c) mysqlnd_change_user((r), (a), (b), (c), false)
#define mysql_character_set_name(c) mysqlnd_character_set_name((c))
#define mysql_close(r) mysqlnd_close((r), MYSQLND_CLOSE_EXPLICIT)
#define mysql_commit(r) mysqlnd_commit((r), TRANS_COR_NO_OPT, NULL)
@ -104,7 +104,7 @@
#define mysql_options(c,a,v) mysqlnd_options((c), (a), (v))
#define mysql_options4(c,a,k,v) mysqlnd_options4((c), (a), (k), (v))
#define mysql_stmt_init(r) mysqlnd_stmt_init((r))
#define mysql_free_result(r) mysqlnd_free_result((r), FALSE)
#define mysql_free_result(r) mysqlnd_free_result((r), false)
#define mysql_store_result(r) mysqlnd_store_result((r))
#define mysql_use_result(r) mysqlnd_use_result((r))
#define mysql_async_store_result(r) mysqlnd_async_store_result((r))

2
ext/pdo_mysql/mysql_statement.c
View File

@ -562,7 +562,7 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, enum pdo_fetch_orientation ori
PDO_DBG_ENTER("pdo_mysql_stmt_fetch");
PDO_DBG_INF_FMT("stmt=%p", S->stmt);
if (S->stmt) {
if (FAIL == mysqlnd_stmt_fetch(S->stmt, &fetched_anything) || fetched_anything == FALSE) {
if (FAIL == mysqlnd_stmt_fetch(S->stmt, &fetched_anything) || !fetched_anything) {
pdo_mysql_error_stmt(stmt);
PDO_DBG_RETURN(0);
}

10
ext/pdo_mysql/php_pdo_mysql_int.h
View File

@ -34,12 +34,12 @@ typedef _Bool my_bool;
#if defined(PDO_USE_MYSQLND) && PHP_DEBUG && !defined(PHP_WIN32)
#define PDO_DBG_ENABLED 1
#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)
#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)
#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)
#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)
#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)
#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)
#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)
#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)
#define PDO_DBG_ENTER(func_name) \
bool dbg_skip_trace = TRUE; \
bool dbg_skip_trace = true; \
((void) dbg_skip_trace); \
if (PDO_MYSQL_G(dbg)) \
dbg_skip_trace = !PDO_MYSQL_G(dbg)->m->func_enter(PDO_MYSQL_G(dbg), __LINE__, __FILE__, func_name, strlen(func_name));