mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Use compound literals in mysql_options() call

Browse Source 
Makes use of compound literals instead of using extra my_bool
variable just to hold "true/1" value.
This commit is contained in:
Ondřej Surý 2020-03-18 16:15:43 +01:00 committed by Mark Andrews
parent c6d5d5c88f
commit 715b7a7cec
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/dlz/drivers/dlz_mysql_driver.c
View File

@ -763,9 +763,6 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[],
char *endp; char *endp;
int j; int j;
unsigned int flags = 0; unsigned int flags = 0;
#if MYSQL_VERSION_ID >= 50000
my_bool auto_reconnect = 1;
#endif /* if MYSQL_VERSION_ID >= 50000 */
UNUSED(driverarg); UNUSED(driverarg);
UNUSED(dlzname); UNUSED(dlzname);
@ -901,21 +898,21 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[],
pass = getParameterValue(argv[1], "pass="); pass = getParameterValue(argv[1], "pass=");
socket = getParameterValue(argv[1], "socket="); socket = getParameterValue(argv[1], "socket=");
#if MYSQL_VERSION_ID >= 50000
/* enable automatic reconnection. */ /* enable automatic reconnection. */
if (mysql_options((MYSQL *)dbi->dbconn, MYSQL_OPT_RECONNECT, if (mysql_options((MYSQL *)dbi->dbconn, MYSQL_OPT_RECONNECT,
&auto_reconnect) != 0) &(my_bool){ 1 }) != 0)
{ {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DLZ, ISC_LOG_WARNING, DNS_LOGMODULE_DLZ, ISC_LOG_WARNING,
"mysql driver failed to set " "mysql driver failed to set "
"MYSQL_OPT_RECONNECT option, continuing"); "MYSQL_OPT_RECONNECT option, "
"continuing");
} }
#endif /* if MYSQL_VERSION_ID >= 50000 */
for (j = 0; dbc == NULL && j < 4; j++) for (j = 0; dbc == NULL && j < 4; j++) {
dbc = mysql_real_connect((MYSQL *)dbi->dbconn, host, user, pass, dbc = mysql_real_connect((MYSQL *)dbi->dbconn, host, user, pass,
dbname, port, socket, flags); dbname, port, socket, flags);
}
/* let user know if we couldn't connect. */ /* let user know if we couldn't connect. */
if (dbc == NULL) { if (dbc == NULL) {

7
contrib/dlz/modules/mysql/dlz_mysql_dynamic.c
View File

@ -816,9 +816,6 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
char *endp; char *endp;
int j; int j;
const char *helper_name; const char *helper_name;
#if MYSQL_VERSION_ID >= 50000
my_bool auto_reconnect = 1;
#endif /* if MYSQL_VERSION_ID >= 50000 */
#if PTHREADS #if PTHREADS
int dbcount; int dbcount;
int i; int i;
@ -1016,17 +1013,15 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
dbc = NULL; dbc = NULL;
#if MYSQL_VERSION_ID >= 50000
/* enable automatic reconnection. */ /* enable automatic reconnection. */
if (mysql_options((MYSQL *)dbi->dbconn, MYSQL_OPT_RECONNECT, if (mysql_options((MYSQL *)dbi->dbconn, MYSQL_OPT_RECONNECT,
&auto_reconnect) != 0) &(my_bool){ 1 }) != 0)
{ {
mysql->log(ISC_LOG_WARNING, "MySQL module failed to " mysql->log(ISC_LOG_WARNING, "MySQL module failed to "
"set " "set "
"MYSQL_OPT_RECONNECT " "MYSQL_OPT_RECONNECT "
"option, continuing"); "option, continuing");
} }
#endif /* if MYSQL_VERSION_ID >= 50000 */
for (j = 0; dbc == NULL && j < 4; j++) { for (j = 0; dbc == NULL && j < 4; j++) {
dbc = mysql_real_connect( dbc = mysql_real_connect(

8
contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
View File

@ -1024,10 +1024,6 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
*/ */
if (mysql_thread_safe()) { if (mysql_thread_safe()) {
for (n = 0; n < MAX_DBI; n++) { for (n = 0; n < MAX_DBI; n++) {
#if MYSQL_VERSION_ID >= 50000
my_bool opt = 1;
#endif
dlz_mutex_init(&state->db[n].mutex, NULL); dlz_mutex_init(&state->db[n].mutex, NULL);
dlz_mutex_lock(&state->db[n].mutex); dlz_mutex_lock(&state->db[n].mutex);
state->db[n].id = n; state->db[n].id = n;
@ -1035,10 +1031,8 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
state->db[n].sock = mysql_init(NULL); state->db[n].sock = mysql_init(NULL);
mysql_options(state->db[n].sock, mysql_options(state->db[n].sock,
MYSQL_READ_DEFAULT_GROUP, modname); MYSQL_READ_DEFAULT_GROUP, modname);
#if MYSQL_VERSION_ID >= 50000
mysql_options(state->db[n].sock, MYSQL_OPT_RECONNECT, mysql_options(state->db[n].sock, MYSQL_OPT_RECONNECT,
&opt); &(my_bool){ 1 });
#endif
dlz_mutex_unlock(&state->db[n].mutex); dlz_mutex_unlock(&state->db[n].mutex);
} }