diff options
| author |   Sébastien Helleu <flashcode@flashtux.org> | 2024-04-25 00:21:54 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2024-04-26 08:41:44 +0200 |
| commit | 529a22e342e9195bd0173877e707d74397f55d96 (patch) | |
| tree | 56c6fb9d00bf630b8f78f978ab36af1240da3853 /src/plugins/irc/irc-server.c | |
| parent | tests: split hook tests into multiple files (issue #865) (diff) | |
| download | weechat-529a22e342e9195bd0173877e707d74397f55d96.tar.xz weechat-529a22e342e9195bd0173877e707d74397f55d96.zip | |
plugins: remove check of NULL pointers before calling weechat_unhook() (issue #865)
Diffstat (limited to 'src/plugins/irc/irc-server.c')
| -rw-r--r-- | src/plugins/irc/irc-server.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index c127f1013..d6051b2c7 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -2298,16 +2298,11 @@ irc_server_free_data (struct t_irc_server *server) free (server->retry_array); free (server->current_address); free (server->current_ip); - if (server->hook_connect) - weechat_unhook (server->hook_connect); - if (server->hook_fd) - weechat_unhook (server->hook_fd); - if (server->hook_timer_connection) - weechat_unhook (server->hook_timer_connection); - if (server->hook_timer_sasl) - weechat_unhook (server->hook_timer_sasl); - if (server->hook_timer_anti_flood) - weechat_unhook (server->hook_timer_anti_flood); + weechat_unhook (server->hook_connect); + weechat_unhook (server->hook_fd); + weechat_unhook (server->hook_timer_connection); + weechat_unhook (server->hook_timer_sasl); + weechat_unhook (server->hook_timer_anti_flood); irc_server_free_sasl_data (server); free (server->unterminated_message); if (server->nicks_array) @@ -4396,8 +4391,7 @@ irc_server_login (struct t_irc_server *server) (realname && realname[0]) ? realname : ((username2) ? username2 : "weechat")); free (username2); - if (server->hook_timer_connection) - weechat_unhook (server->hook_timer_connection); + weechat_unhook (server->hook_timer_connection); server->hook_timer_connection = weechat_hook_timer ( IRC_SERVER_OPTION_INTEGER (server, IRC_SERVER_OPTION_CONNECTION_TIMEOUT) * 1000, 0, 1, |