diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c index f9ca7b37..208273dc 100644 --- a/src/irc/notifylist/notify-ison.c +++ b/src/irc/notifylist/notify-ison.c @@ -285,19 +285,17 @@ static void ison_check_parts(IRC_SERVER_REC *server) static void event_ison(IRC_SERVER_REC *server, const char *data) { MODULE_SERVER_REC *mserver; - char *params, *online; + char *online; g_return_if_fail(data != NULL); g_return_if_fail(server != NULL); - params = event_get_params(data, 2, NULL, &online); + event_get_params(data, 2, NULL, &online); mserver = MODULE_DATA(server); ison_save_users(mserver, online); if (--mserver->ison_count > 0) { - /* wait for the rest of the /ISON replies */ - g_free(params); return; } @@ -308,8 +306,6 @@ static void event_ison(IRC_SERVER_REC *server, const char *data) g_slist_foreach(mserver->ison_tempusers, (GFunc) g_free, NULL); g_slist_free(mserver->ison_tempusers); mserver->ison_tempusers = NULL; - - g_free(params); } static void read_settings(void) diff --git a/src/irc/notifylist/notify-whois.c b/src/irc/notifylist/notify-whois.c index 2d0736b5..63715801 100644 --- a/src/irc/notifylist/notify-whois.c +++ b/src/irc/notifylist/notify-whois.c @@ -32,19 +32,18 @@ static char *last_notify_nick; static void event_whois(IRC_SERVER_REC *server, const char *data) { - char *params, *nick, *user, *host, *realname; + char *nick, *user, *host, *realname; NOTIFY_NICK_REC *nickrec; NOTIFYLIST_REC *notify; g_return_if_fail(data != NULL); g_return_if_fail(server != NULL); - params = event_get_params(data, 6, NULL, &nick, &user, &host, NULL, &realname); + event_get_params(data, 6, NULL, &nick, &user, &host, NULL, &realname); notify = notifylist_find(nick, server->connrec->chatnet); if (notify != NULL && !mask_match(SERVER(server), notify->mask, nick, user, host)) { /* user or host didn't match */ - g_free(params); return; } @@ -64,25 +63,22 @@ static void event_whois(IRC_SERVER_REC *server, const char *data) nickrec->away = FALSE; nickrec->host_ok = TRUE; } - g_free(params); } static void event_whois_away(IRC_SERVER_REC *server, const char *data) { NOTIFY_NICK_REC *nickrec; - char *params, *nick, *awaymsg; + char *nick, *awaymsg; g_return_if_fail(data != NULL); - params = event_get_params(data, 3, NULL, &nick, &awaymsg); + event_get_params(data, 3, NULL, &nick, &awaymsg); nickrec = notify_nick_find(server, nick); if (nickrec != NULL) { nickrec->awaymsg = g_strdup(awaymsg); nickrec->away = TRUE; } - - g_free(params); } /* All WHOIS replies got, now announce all the changes at once. */