fixed last commit

diff --git a/cmd_neonserv_giveowner.c b/cmd_neonserv_giveowner.c
index 5cf31852d7c2a888b9bb735c9024a2fdef713224..0187d1dca887deadc881c056f1493b37626efd9a 100644 (file)
--- a/cmd_neonserv_giveowner.c
+++ b/cmd_neonserv_giveowner.c
@@ -25,8 +25,7 @@ static CMD_BIND(neonserv_cmd_giveowner) {
     }
     MYSQL_RES *res;
     MYSQL_ROW row;
-    int userid;
-    printf_mysql_query("SELECT `channel_lastgiveowner` FROM `channels` WHERE `channel_id` = '%s'", chan->channel_id);
+    printf_mysql_query("SELECT `channel_lastgiveowner` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) == NULL) return;
     if(strcmp(row[0], "0") && (atoi(row[0]) + GIVEOWNER_TIMEOUT) > time(0)) {

diff --git a/cmd_neonserv_trim.c b/cmd_neonserv_trim.c
index 99b8c16d13100c99dee7530a4d1abef04879fa0d..569f642e48854139f16b8d10b3d561302cf0df5e 100644 (file)
--- a/cmd_neonserv_trim.c
+++ b/cmd_neonserv_trim.c
@@ -71,15 +71,15 @@ static CMD_BIND(neonserv_cmd_trim) {
     get_userlist(chan, neonserv_cmd_trim_userlist_lookup, cache);
 }
 
-static USERLIST_CALLBACK(neonserv_cmd_users_userlist_lookup) {
-    struct neonserv_cmd_users_cache *cache = data;
+static USERLIST_CALLBACK(neonserv_cmd_trim_userlist_lookup) {
+    struct neonserv_cmd_trim_cache *cache = data;
     //got userlist
     neonserv_cmd_trim_async1(cache->client, cache->textclient, cache->user, chan, cache->min_access, cache->max_access, cache->duration);
     free(cache);
 }
 
 static void neonserv_cmd_trim_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, int min_access, int max_access, int duration) {
-    YSQL_RES *res;
+    MYSQL_RES *res;
     MYSQL_ROW row;
     int trim_count = 0, is_here;
     struct ChanUser *chanuser;