aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-15 04:28:09 -04:00
Code

Use 0 as a sentinel value for sasl_timeout

Browse Source 
If sasl_timeout is never initialized with a valid timeout id then
calling /disconnect on the server calls g_source_remove() with 0 as tag,
causing an harmless error message to be printed.
Beside that, the sasl_timeout field is defined as a unsigned int.
We can use 0 as sentiel since g_timeout_add returns tags that are always
greater than zero.
This commit is contained in:
LemonBoy 2016-03-20 21:47:02 +01:00
parent 795b7de808
commit 550fe6f010
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/irc/core/sasl.c
View File

@ -34,7 +34,7 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
irc_send_cmd_now(server, "AUTHENTICATE *"); irc_send_cmd_now(server, "AUTHENTICATE *");
cap_finish_negotiation(server); cap_finish_negotiation(server);
server->sasl_timeout = -1; server->sasl_timeout = 0;
signal_emit("server sasl failure", 2, server, "The authentication timed out"); signal_emit("server sasl failure", 2, server, "The authentication timed out");
@ -64,9 +64,9 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
char *params, *error; char *params, *error;
/* Stop any pending timeout, if any */ /* Stop any pending timeout, if any */
if (server->sasl_timeout != -1) { if (server->sasl_timeout != 0) {
g_source_remove(server->sasl_timeout); g_source_remove(server->sasl_timeout);
server->sasl_timeout = -1; server->sasl_timeout = 0;
} }
params = event_get_params(data, 2, NULL, &error); params = event_get_params(data, 2, NULL, &error);
@ -81,9 +81,9 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from) static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from)
{ {
if (server->sasl_timeout != -1) { if (server->sasl_timeout != 0) {
g_source_remove(server->sasl_timeout); g_source_remove(server->sasl_timeout);
server->sasl_timeout = -1; server->sasl_timeout = 0;
} }
signal_emit("server sasl success", 1, server); signal_emit("server sasl success", 1, server);
@ -94,9 +94,9 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from) static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from)
{ {
if (server->sasl_timeout != -1) { if (server->sasl_timeout != 0) {
g_source_remove(server->sasl_timeout); g_source_remove(server->sasl_timeout);
server->sasl_timeout = -1; server->sasl_timeout = 0;
} }
signal_emit("server sasl success", 1, server); signal_emit("server sasl success", 1, server);
@ -114,9 +114,9 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
conn = server->connrec; conn = server->connrec;
/* Stop the timer */ /* Stop the timer */
if (server->sasl_timeout != -1) { if (server->sasl_timeout != 0) {
g_source_remove(server->sasl_timeout); g_source_remove(server->sasl_timeout);
server->sasl_timeout = -1; server->sasl_timeout = 0;
} }
switch (conn->sasl_mechanism) { switch (conn->sasl_mechanism) {
@ -161,9 +161,9 @@ static void sasl_disconnected(IRC_SERVER_REC *server)
return; return;
} }
if (server->sasl_timeout != -1) { if (server->sasl_timeout != 0) {
g_source_remove(server->sasl_timeout); g_source_remove(server->sasl_timeout);
server->sasl_timeout = -1; server->sasl_timeout = 0;
} }
} }