execute mysql_check only if a query fails.

diff --git a/DBHelper.c b/DBHelper.c
index 5e9005d771e669d8bf55487a160943b84bd48322..181fff607b542c6262721a4fe973414594ec5d8c 100644 (file)
--- a/DBHelper.c
+++ b/DBHelper.c
@@ -8,7 +8,6 @@
 #include "tools.h"
 
 void _loadUserSettings(struct UserNode *user) {
-    check_mysql();
     MYSQL_RES *res;
     MYSQL_ROW row;
     printf_mysql_query("SELECT `user_lang`, `user_reply_privmsg`, `user_god` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
@@ -36,7 +35,6 @@ int getChannelAccess(struct UserNode *user, struct ChanNode *chan, int override)
     if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return 0;
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
     int caccess = 0;
     printf_mysql_query("SELECT `user_id`, `user_access`, `user_god` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
     res = mysql_use();
@@ -95,7 +93,6 @@ int checkChannelAccess(struct UserNode *user, struct ChanNode *chan, char *chann
 }
 
 void _loadChannelSettings(struct ChanNode *chan) {
-    check_mysql();
     MYSQL_RES *res;
     MYSQL_ROW row;
     printf_mysql_query("SELECT `channel_id` FROM `channels` WHERE `channel_name` = '%s'", escape_string(chan->name));

diff --git a/bot_NeonServ.c b/bot_NeonServ.c
index 54a82e6a64d22bfb68978778c7474ed46e632d55..6092e1717878b5940423182c92ec65ccf327cd6e 100644 (file)
--- a/bot_NeonServ.c
+++ b/bot_NeonServ.c
@@ -241,7 +241,6 @@ static void neonserv_bot_ready(struct ClientSocket *client) {
     MYSQL_RES *res;
     MYSQL_ROW row;
     
-    check_mysql();
     printf_mysql_query("SELECT `automodes` FROM `bots` WHERE `id` = '%d'", client->clientid);
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) != NULL) {
@@ -299,8 +298,6 @@ static void start_bots() {
 }
 
 void init_NeonServ() {
-    check_mysql();
-    
     register_command(BOTID, "modes", neonserv_cmd_modes, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, NULL, 0);
     
     register_command(BOTID, "adduser",      neonserv_cmd_adduser,   2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,  "#channel_canadd",      0);

diff --git a/cmd_neonserv_addban.c b/cmd_neonserv_addban.c
index aebbb28664a43df2764a286ddc590b57369345b3..ca0d6924af129e6fc83ab1b0392713087fc9be37 100644 (file)
--- a/cmd_neonserv_addban.c
+++ b/cmd_neonserv_addban.c
@@ -45,7 +45,6 @@ static void neonserv_cmd_addban_async1(struct ClientSocket *client, struct Clien
     char usermask[NICKLEN+USERLEN+HOSTLEN+3];
     struct UserNode *cuser;
     struct ChanUser *chanuser;
-    check_mysql();
     mask = make_banmask(mask, hostmask_buffer);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         cuser = chanuser->user;

diff --git a/cmd_neonserv_adduser.c b/cmd_neonserv_adduser.c
index 80a9043044c91c89c18ff9b63e69904d6f41c567..ceab6cd6287dd72721542a6502c6d6949dd09679 100644 (file)
--- a/cmd_neonserv_adduser.c
+++ b/cmd_neonserv_adduser.c
@@ -19,7 +19,6 @@ static CMD_BIND(neonserv_cmd_adduser) {
     int caccess;
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
     caccess = atoi(argv[1]);
     if(caccess <= 0 || caccess > 500) {
         reply(getTextBot(), user, "NS_INVALID_ACCESS", caccess);

diff --git a/cmd_neonserv_ban.c b/cmd_neonserv_ban.c
index e51934d4a38d98224ce879ac013868ad1ac72b3c..50db4c44af942e2f3636cd5247946303589ef163 100644 (file)
--- a/cmd_neonserv_ban.c
+++ b/cmd_neonserv_ban.c
@@ -41,7 +41,6 @@ static void neonserv_cmd_ban_async1(struct ClientSocket *client, struct ClientSo
     struct ModeBuffer *modeBuf;
     modeBuf = initModeBuffer(client, chan);
     nextmask = masks;
-    check_mysql();
     while((mask = nextmask)) {
         nextmask = strstr(mask, ",");
         if(nextmask) {

diff --git a/cmd_neonserv_clvl.c b/cmd_neonserv_clvl.c
index 1aa00aad0d1c0080d674d5238111ffe98bb2bc6b..51bab6a502e8711f2fb82a96921d22fe79830c54 100644 (file)
--- a/cmd_neonserv_clvl.c
+++ b/cmd_neonserv_clvl.c
@@ -16,7 +16,6 @@ struct neonserv_cmd_clvl_cache {
 
 static CMD_BIND(neonserv_cmd_clvl) {
     int caccess;
-    check_mysql();
     caccess = atoi(argv[1]);
     if(caccess <= 0 || caccess > 500) {
         reply(getTextBot(), user, "NS_INVALID_ACCESS", caccess);

diff --git a/cmd_neonserv_delban.c b/cmd_neonserv_delban.c
index 0ac7dcf147009af2a56a6879286999ec3e91c07a..b211a116f8dea5dd479c3565185e13fe401a3afb 100644 (file)
--- a/cmd_neonserv_delban.c
+++ b/cmd_neonserv_delban.c
@@ -5,7 +5,6 @@
 
 static CMD_BIND(neonserv_cmd_delban) {
     char hostmask_buffer[NICKLEN+USERLEN+HOSTLEN+3];
-    check_mysql();
     char *mask = make_banmask(argv[0], hostmask_buffer);
     int matching_bans = 0;
     MYSQL_RES *res;

diff --git a/cmd_neonserv_delme.c b/cmd_neonserv_delme.c
index cca126eb0c97609657275e46d0f95dff9ba00704..13d288fbf07ccdb8c56a449d6fc5a4cf94e7bae2 100644 (file)
--- a/cmd_neonserv_delme.c
+++ b/cmd_neonserv_delme.c
@@ -4,7 +4,6 @@
 */
 
 static CMD_BIND(neonserv_cmd_delme) {
-    check_mysql();
     MYSQL_RES *res;
     MYSQL_ROW row;
     int userid;

diff --git a/cmd_neonserv_deluser.c b/cmd_neonserv_deluser.c
index 806a2536b17735d8c909572f657712bed168e720..e7928f90db82c5f8187b93a74a96165c6eb53242 100644 (file)
--- a/cmd_neonserv_deluser.c
+++ b/cmd_neonserv_deluser.c
@@ -13,7 +13,6 @@ struct neonserv_cmd_deluser_cache {
 };
 
 static CMD_BIND(neonserv_cmd_deluser) {
-    check_mysql();
     if(argv[0][0] == '*') {
         //we've got an auth
         argv[0]++;

diff --git a/cmd_neonserv_deopall.c b/cmd_neonserv_deopall.c
index 8fe1f8248a82f42bf505d566db6ad3baa0af972f..92d5b2fb61e4d4e1ac7f177191b23e095b88cdb2 100644 (file)
--- a/cmd_neonserv_deopall.c
+++ b/cmd_neonserv_deopall.c
@@ -45,7 +45,6 @@ static void neonserv_cmd_deopall_async1(struct ClientSocket *client, struct Clie
     char *nickmask = NULL;
     struct ChanUser *chanuser;
     struct ModeBuffer *modeBuf;
-    check_mysql();
     if(!checkChannelAccess(user, chan, "channel_canop", 1, 0)) {
         reply(getTextBot(), user, "NS_ACCESS_DENIED");
         return;

diff --git a/cmd_neonserv_downall.c b/cmd_neonserv_downall.c
index 28c02ba201d1c40a548fc11f465ffe0b6d191737..6a23db8a50f8ead0c50e79f33327ae8439fa6804 100644 (file)
--- a/cmd_neonserv_downall.c
+++ b/cmd_neonserv_downall.c
@@ -4,7 +4,6 @@
 */
 
 static CMD_BIND(neonserv_cmd_downall) {
-    check_mysql();
     struct ChanUser *chanuser;
     for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = getUserChannels(user, chanuser)) {
         chan = chanuser->chan;

diff --git a/cmd_neonserv_giveowner.c b/cmd_neonserv_giveowner.c
index 0187d1dca887deadc881c056f1493b37626efd9a..bea8de0fe981561fc219b33bdb8f0a4c817f2903 100644 (file)
--- a/cmd_neonserv_giveowner.c
+++ b/cmd_neonserv_giveowner.c
@@ -18,7 +18,6 @@ struct neonserv_cmd_giveowner_cache {
 };
 
 static CMD_BIND(neonserv_cmd_giveowner) {
-    check_mysql();
     if(getChannelAccess(user, chan, 0) != 500) {
         reply(getTextBot(), user, "NS_ACCESS_DENIED");
         return;

diff --git a/cmd_neonserv_kick.c b/cmd_neonserv_kick.c
index 9223f69816ac57350d93e16a2ac05860c2be18dc..66aa32a0ca0e9f8a00cecd17be1385d6e3ee964f 100644 (file)
--- a/cmd_neonserv_kick.c
+++ b/cmd_neonserv_kick.c
@@ -45,7 +45,6 @@ static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientS
     struct UserNode *cuser;
     struct ChanUser *chanuser;
     nextnick = nicks;
-    check_mysql();
     while((nick = nextnick)) {
         nextnick = strstr(nick, ",");
         if(nextnick) {

diff --git a/cmd_neonserv_kickban.c b/cmd_neonserv_kickban.c
index c338652f6fc69db8556b2f7d3448aa35c03c6e68..ae59941246c06f0f826d9203bfc7288b8ebdd3fe 100644 (file)
--- a/cmd_neonserv_kickban.c
+++ b/cmd_neonserv_kickban.c
@@ -46,7 +46,6 @@ static void neonserv_cmd_kickban_async1(struct ClientSocket *client, struct Clie
     struct ChanUser *chanuser;
     char usermask[NICKLEN+USERLEN+HOSTLEN+3];
     nextnick = nicks;
-    check_mysql();
     while((nick = nextnick)) {
         nextnick = strstr(nick, ",");
         if(nextnick) {

diff --git a/cmd_neonserv_mdeluser.c b/cmd_neonserv_mdeluser.c
index 7dceafb5bbaba77d835e56694026c9a1a1203e0a..6608066cd6d8e2e584392591856c32608b9c10fe 100644 (file)
--- a/cmd_neonserv_mdeluser.c
+++ b/cmd_neonserv_mdeluser.c
@@ -5,7 +5,6 @@
 */
 
 static CMD_BIND(neonserv_cmd_mdeluser) {
-    check_mysql();
     if(!checkChannelAccess(user, chan, "channel_candel", 1, 0)) {
         reply(getTextBot(), user, "NS_ACCESS_DENIED");
         return;

diff --git a/cmd_neonserv_netinfo.c b/cmd_neonserv_netinfo.c
index 5d814d8f8d9efb9fe0db6050013a91d3be351710..b08fc8fe1a12509e4a7f6dccf312035106254275 100644 (file)
--- a/cmd_neonserv_netinfo.c
+++ b/cmd_neonserv_netinfo.c
@@ -71,7 +71,6 @@ static CMD_BIND(neonserv_cmd_netinfo) {
     
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
     printf_mysql_query("SHOW TABLE STATUS");
     res = mysql_use();
     int mysql_entrys[4];

diff --git a/cmd_neonserv_set.c b/cmd_neonserv_set.c
index 7bba0d0cfa68ecb190adef7147df7840ad2b63e5..c87acdc14f776b522cc7cce606dc52ed79c4ecfa 100644 (file)
--- a/cmd_neonserv_set.c
+++ b/cmd_neonserv_set.c
@@ -83,7 +83,6 @@ static CMD_BIND(neonserv_cmd_set) {
         if(argc > 1 && !strcmp(argv[1], defaultskey)) {
             char query[MAX_QUERY_LEN];
             int querypos = 0;
-            check_mysql();
             i = 0;
             while(channel_settings[i].setting) {
                 if(channel_settings[i].chanfield)
@@ -122,7 +121,6 @@ static CMD_BIND(neonserv_cmd_set) {
             reply(getTextBot(), user, "NS_SET_UNKNOWN_SETTING", argv[0]);
         }
     } else {
-        check_mysql();
         char query[MAX_QUERY_LEN], *value, *org_value, *tmp, nameBuf[64];
         int querypos = 0;
         MYSQL_RES *res, *defaults_res;
@@ -197,7 +195,6 @@ static void neonserv_cmd_set_setting(struct ClientSocket *client, struct UserNod
     //get current value
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
     printf_mysql_query("SELECT `%s` FROM `channels` WHERE `channel_id` = '%d'", channel_settings[setting].chanfield, chan->channel_id);
     res = mysql_use();
     row = mysql_fetch_row(res);
@@ -290,7 +287,6 @@ static char* neonserv_cmd_set_trigger(struct ClientSocket *client, struct UserNo
     //get current trigger
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
     printf_mysql_query("SELECT `trigger` FROM `bot_channels` WHERE `chanid` = '%d' AND `botid` = '%d'", chan->channel_id, client->clientid);
     res = mysql_use();
     row = mysql_fetch_row(res);
@@ -318,7 +314,6 @@ static char* neonserv_cmd_set_modes(struct ClientSocket *client, struct UserNode
     //get current value
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
     printf_mysql_query("SELECT `channel_modes` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
     res = mysql_use();
     row = mysql_fetch_row(res);
@@ -344,7 +339,6 @@ static char* neonserv_cmd_set_dynlimit(struct ClientSocket *client, struct UserN
     //get current value
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
     printf_mysql_query("SELECT `channel_dynlimit` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
     res = mysql_use();
     row = mysql_fetch_row(res);
@@ -375,7 +369,6 @@ static char* neonserv_cmd_set_nodelete(struct ClientSocket *client, struct UserN
     //get current value
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
     printf_mysql_query("SELECT `channel_nodelete` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
     res = mysql_use();
     row = mysql_fetch_row(res);

diff --git a/cmd_neonserv_suspend.c b/cmd_neonserv_suspend.c
index bb6db50f0aa4cb5e995c8c4d2da04161924d8722..867b74bbb965e8f158252edd9966f55c737f2973 100644 (file)
--- a/cmd_neonserv_suspend.c
+++ b/cmd_neonserv_suspend.c
@@ -13,7 +13,6 @@ struct neonserv_cmd_suspend_cache {
 };
 
 static CMD_BIND(neonserv_cmd_suspend) {
-    check_mysql();
     if(argv[0][0] == '*') {
         //we've got an auth
         argv[0]++;

diff --git a/cmd_neonserv_topic.c b/cmd_neonserv_topic.c
index b9ea65d7944064e1c81edbfa3141ad3e46e81144..c530de40cd1a3227ade1f16220637bd40387b153 100644 (file)
--- a/cmd_neonserv_topic.c
+++ b/cmd_neonserv_topic.c
@@ -11,7 +11,6 @@
 #define ADVANCEDTOPIC_MAXID 9
 
 static CMD_BIND(neonserv_cmd_topic) {
-    check_mysql();
     MYSQL_RES *res;
     MYSQL_ROW row, default_row = NULL;
     int advanced_topic, i;

diff --git a/cmd_neonserv_trim.c b/cmd_neonserv_trim.c
index 569f642e48854139f16b8d10b3d561302cf0df5e..96791954eb4a6e099d91c93e2469a1690a37feaa 100644 (file)
--- a/cmd_neonserv_trim.c
+++ b/cmd_neonserv_trim.c
@@ -15,7 +15,6 @@ struct neonserv_cmd_trim_cache {
 };
 
 static CMD_BIND(neonserv_cmd_trim) {
-    check_mysql();
     if(stricmp(argv[0], "bans") && !checkChannelAccess(user, chan, "channel_candel", 1, 0)) {
         reply(getTextBot(), user, "NS_ACCESS_DENIED");
         return;

diff --git a/cmd_neonserv_unsuspend.c b/cmd_neonserv_unsuspend.c
index dabe1aa95fb527638d1a04a9dbb687c1141111b8..58fdee5f74a3729eee9e02894a43083c078ed059 100644 (file)
--- a/cmd_neonserv_unsuspend.c
+++ b/cmd_neonserv_unsuspend.c
@@ -13,7 +13,6 @@ struct neonserv_cmd_unsuspend_cache {
 };
 
 static CMD_BIND(neonserv_cmd_unsuspend) {
-    check_mysql();
     if(argv[0][0] == '*') {
         //we've got an auth
         argv[0]++;

diff --git a/cmd_neonserv_upall.c b/cmd_neonserv_upall.c
index f23d96dbddda361156b4fc4d55b3b4b5ce81ca74..6324c110c65449dfe45822363d27fe7156c41f8d 100644 (file)
--- a/cmd_neonserv_upall.c
+++ b/cmd_neonserv_upall.c
@@ -4,7 +4,6 @@
 */
 
 static CMD_BIND(neonserv_cmd_upall) {
-    check_mysql();
     MYSQL_RES *res, *default_res;
     MYSQL_ROW row, default_row;
     struct ChanUser *chanuser;

diff --git a/cmd_neonserv_wipeinfo.c b/cmd_neonserv_wipeinfo.c
index 72275ab5a369b132142493829bafc7ff837b2c88..71a7160d9570bb829fc31d99e96c2f106e5b335d 100644 (file)
--- a/cmd_neonserv_wipeinfo.c
+++ b/cmd_neonserv_wipeinfo.c
@@ -13,7 +13,6 @@ struct neonserv_cmd_wipeinfo_cache {
 };
 
 static CMD_BIND(neonserv_cmd_wipeinfo) {
-    check_mysql();
     if(argv[0][0] == '*') {
         //we've got an auth
         argv[0]++;

diff --git a/modcmd.c b/modcmd.c
index 1da09507f6b800eb3bc655ce50ce7831d4464aac..c480529e9389d0dcf9f5e272b3e96ba5734be21e 100644 (file)
--- a/modcmd.c
+++ b/modcmd.c
@@ -257,7 +257,6 @@ static void handle_command_async(struct ClientSocket *client, struct UserNode *u
         }
     }
     if((cbind->func->flags & CMDFLAG_REGISTERED_CHAN)) {
-        check_mysql();
         MYSQL_ROW defaults = NULL;
         char access_list[256];
         int access_pos = 0;

diff --git a/mysqlConn.c b/mysqlConn.c
index 81fa038cbbc3af2086ea15e5f11d4c121b005cc8..53b50e995ce3f495c435a94bcc69b52446b07533 100644 (file)
--- a/mysqlConn.c
+++ b/mysqlConn.c
@@ -18,6 +18,7 @@ static struct escaped_string *escaped_strings;
 void check_mysql() {
     if(mysql_ping(mysql_conn)) {
         //mysql error
+        show_mysql_error();
     }
 }
 
@@ -80,7 +81,10 @@ void printf_mysql_query(const char *text, ...) {
     queryBuf[pos] = '\0';
     printf("MySQL: %s\n", queryBuf);
     if(mysql_query(mysql_conn, queryBuf)) {
-        show_mysql_error();
+        check_mysql();
+        if(mysql_query(mysql_conn, queryBuf)) {
+            show_mysql_error();
+        }
     }
 }