hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed mod-mysql.c to compile smoothly without MYSQL_OPT_RECONNECT defined

Browse Source
This commit is contained in:
hyung-hwan 2019-09-03 09:47:41 +00:00
parent c6522a0291
commit 8c6a7ae29c
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qse/lib/awkmod/mod-mysql.c
View File

@ -30,6 +30,10 @@
#include <qse/cmn/main.h> #include <qse/cmn/main.h>
#include <qse/cmn/rbt.h> #include <qse/cmn/rbt.h>
#if !defined(MYSQL_OPT_RECONNECT)
# define DUMMY_OPT_RECONNECT 31231 /* randomly chosen */
#endif
#define __IMAP_NODE_T_DATA MYSQL* mysql; int connect_ever_attempted; #define __IMAP_NODE_T_DATA MYSQL* mysql; int connect_ever_attempted;
#define __IMAP_LIST_T_DATA int errnum; qse_char_t errmsg[256]; #define __IMAP_LIST_T_DATA int errnum; qse_char_t errmsg[256];
#define __IMAP_LIST_T sql_list_t #define __IMAP_LIST_T sql_list_t
@ -299,6 +303,7 @@ static int fnc_get_option (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
} }
break; break;
#if defined(MYSQL_OPT_RECONNECT)
case MYSQL_OPT_RECONNECT: case MYSQL_OPT_RECONNECT:
/* bool * */ /* bool * */
if (mysql_get_option(sql_node->mysql, id, &v.b) != 0) if (mysql_get_option(sql_node->mysql, id, &v.b) != 0)
@ -317,6 +322,16 @@ static int fnc_get_option (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
goto oops; goto oops;
} }
break; break;
#else
/* the system without MYSQL_OPT_RECONNECT available. return 1 all the time */
if (qse_awk_rtx_setrefval(rtx, (qse_awk_val_ref_t*)qse_awk_rtx_getarg(rtx, 2), qse_awk_rtx_makeintval(rtx, 1)) <= -1)
{
qse_awk_rtx_refupval(rtx, retv);
qse_awk_rtx_refdownval(rtx, retv);
goto oops;
}
break;
#endif
default: default:
set_error_on_sql_list (rtx, sql_list, QSE_T("unsupported option id - %zd"), (qse_size_t)id); set_error_on_sql_list (rtx, sql_list, QSE_T("unsupported option id - %zd"), (qse_size_t)id);
@ -379,6 +394,7 @@ static int fnc_set_option (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
vptr = &v.ui; vptr = &v.ui;
break; break;
#if defined(MYSQL_OPT_RECONNECT)
case MYSQL_OPT_RECONNECT: case MYSQL_OPT_RECONNECT:
/* bool * */ /* bool * */
if (qse_awk_rtx_valtoint(rtx, qse_awk_rtx_getarg(rtx, 2), &tv) <= -1) if (qse_awk_rtx_valtoint(rtx, qse_awk_rtx_getarg(rtx, 2), &tv) <= -1)
@ -390,6 +406,11 @@ static int fnc_set_option (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
v.b = tv; v.b = tv;
vptr = &v.b; vptr = &v.b;
break; break;
#else
case DUMMY_OPT_RECONNECT:
ret = 0;
goto done;
#endif
default: default:
set_error_on_sql_list (rtx, sql_list, QSE_T("unsupported option id - %zd"), (qse_size_t)id); set_error_on_sql_list (rtx, sql_list, QSE_T("unsupported option id - %zd"), (qse_size_t)id);
@ -1011,7 +1032,11 @@ static inttab_t inttab[] =
/* keep this table sorted for binary search in query(). */ /* keep this table sorted for binary search in query(). */
{ QSE_T("OPT_CONNECT_TIMEOUT"), { MYSQL_OPT_CONNECT_TIMEOUT } }, { QSE_T("OPT_CONNECT_TIMEOUT"), { MYSQL_OPT_CONNECT_TIMEOUT } },
{ QSE_T("OPT_READ_TIMEOUT"), { MYSQL_OPT_READ_TIMEOUT } }, { QSE_T("OPT_READ_TIMEOUT"), { MYSQL_OPT_READ_TIMEOUT } },
#if defined(MYSQL_OPT_RECONNECT)
{ QSE_T("OPT_RECONNECT"), { MYSQL_OPT_RECONNECT } }, { QSE_T("OPT_RECONNECT"), { MYSQL_OPT_RECONNECT } },
#else
{ QSE_T("OPT_RECONNECT"), { DUMMY_OPT_RECONNECT } },
#endif
{ QSE_T("OPT_WRITE_TIMEOUT"), { MYSQL_OPT_WRITE_TIMEOUT } } { QSE_T("OPT_WRITE_TIMEOUT"), { MYSQL_OPT_WRITE_TIMEOUT } }
}; };