From 782d812720b3684a51c0358fc939d8d1b08d486a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Mon, 22 Sep 2014 07:43:34 +0200 Subject: [PATCH] irc: fix type of value stored in hashtable when joining a channel (closes #211) (cherry picked from commit f91f57f12c2266db28b9e81254ce494c07e8db35) --- ChangeLog.asciidoc | 2 ++ src/plugins/irc/irc-command.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 7d07f1b8a..16811dda7 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -32,6 +32,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * aspell: fix compilation with Enchant < 1.6.0 (closes #192) * aspell: fix crash with command "/aspell addword" if no word is given (closes #164, closes #165) +* irc: fix type of value stored in hashtable when joining a channel + (closes #211) * guile: fix compilation with Guile < 2.0.4 (closes #198) * perl: fix detection of Perl >= 5.20 with autotools * script: fix crash on "/script update" if a script detail is displayed in diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 109f38b6c..2c2da1edf 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -2184,7 +2184,7 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments, char *new_args, **channels, **keys, *pos_space, *pos_keys, *pos_channel; char *channel_name; int i, num_channels, num_keys, length; - int time_now; + time_t time_now; struct t_irc_channel *ptr_channel; if (server->sock < 0) @@ -2247,7 +2247,7 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments, } } new_args[0] = '\0'; - time_now = (int)time (NULL); + time_now = time (NULL); for (i = 0; i < num_channels; i++) { if (i > 0)