diff options
| author | Alexander Færøy <ahf@0x90.dk> | 2014-06-27 14:24:06 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@0x90.dk> | 2014-06-27 14:24:06 +0200 |
| commit | da3f426edbac2703f3bcf0ac04aca69918ec57dc (patch) | |
| tree | 297190280700068bf8a6b9eb762c5faf4821e9d7 | |
| parent | c26a634fe6f65f44cdd036d2657fe4335ed6e309 (diff) | |
| parent | 051d1587b01d12fa6d4d448e29deeae05640b24d (diff) | |
| download | irssi-da3f426edbac2703f3bcf0ac04aca69918ec57dc.zip | |
Merge pull request #63 from dgl/cleanups
Clean-up some compiler warnings
| -rw-r--r-- | src/core/network-openssl.c | 2 | ||||
| -rw-r--r-- | src/fe-common/core/window-items.c | 1 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-whois.c | 2 | ||||
| -rw-r--r-- | src/irc/core/irc-session.c | 3 | ||||
| -rw-r--r-- | src/irc/proxy/listen.c | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index 6a0d078c..768fd540 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -477,7 +477,7 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_ } SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback); - SSL_CTX_set_default_passwd_cb_userdata(ctx, mypass); + SSL_CTX_set_default_passwd_cb_userdata(ctx, (void *)mypass); if (mycert && *mycert) { char *scert = NULL, *spkey = NULL; diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c index c29db9e6..bd6ae5e9 100644 --- a/src/fe-common/core/window-items.c +++ b/src/fe-common/core/window-items.c @@ -211,7 +211,6 @@ void window_item_next(WINDOW_REC *window) WI_ITEM_REC *window_item_find_window(WINDOW_REC *window, void *server, const char *name) { - CHANNEL_REC *channel; GSList *tmp; for (tmp = window->items; tmp != NULL; tmp = tmp->next) { diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c index e48c99c6..c5726124 100644 --- a/src/fe-common/irc/fe-whois.c +++ b/src/fe-common/irc/fe-whois.c @@ -242,7 +242,7 @@ static void hide_safe_channel_id(IRC_SERVER_REC *server, char *chans) if (idchan == NULL) return; } - nick_flags = server->get_nick_flags(server); + nick_flags = server->get_nick_flags(SERVER(server)); while (*idchan != '\0') { id = *idchan; diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c index 3c50e312..bcb0a122 100644 --- a/src/irc/core/irc-session.c +++ b/src/irc/core/irc-session.c @@ -115,7 +115,6 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel, { const char *nick, *prefixes; int op, halfop, voice; - NICK_REC *nickrec; char newprefixes[MAX_USER_PREFIXES + 1]; int i; @@ -145,7 +144,7 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel, newprefixes[i] = '\0'; prefixes = newprefixes; } - nickrec = irc_nicklist_insert(channel, nick, op, halfop, voice, FALSE, prefixes); + irc_nicklist_insert(channel, nick, op, halfop, voice, FALSE, prefixes); } static void session_restore_channel(IRC_CHANNEL_REC *channel) diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c index 5dfd46db..8edffbd3 100644 --- a/src/irc/proxy/listen.c +++ b/src/irc/proxy/listen.c @@ -24,6 +24,7 @@ #include "servers-redirect.h" #include "levels.h" #include "settings.h" +#include "misc.h" #include "irc.h" #include "irc-channels.h" |