Merge pull request #63 from dgl/cleanups

Clean-up some compiler warnings
This commit is contained in:
Alexander Færøy 2014-06-27 14:24:06 +02:00
commit da3f426edb
5 changed files with 4 additions and 5 deletions

View file

@ -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_options(ctx, SSL_OP_NO_SSLv2);
SSL_CTX_set_default_passwd_cb(ctx, get_pem_password_callback); 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) { if (mycert && *mycert) {
char *scert = NULL, *spkey = NULL; char *scert = NULL, *spkey = NULL;

View file

@ -211,7 +211,6 @@ void window_item_next(WINDOW_REC *window)
WI_ITEM_REC *window_item_find_window(WINDOW_REC *window, WI_ITEM_REC *window_item_find_window(WINDOW_REC *window,
void *server, const char *name) void *server, const char *name)
{ {
CHANNEL_REC *channel;
GSList *tmp; GSList *tmp;
for (tmp = window->items; tmp != NULL; tmp = tmp->next) { for (tmp = window->items; tmp != NULL; tmp = tmp->next) {

View file

@ -242,7 +242,7 @@ static void hide_safe_channel_id(IRC_SERVER_REC *server, char *chans)
if (idchan == NULL) if (idchan == NULL)
return; return;
} }
nick_flags = server->get_nick_flags(server); nick_flags = server->get_nick_flags(SERVER(server));
while (*idchan != '\0') { while (*idchan != '\0') {
id = *idchan; id = *idchan;

View file

@ -115,7 +115,6 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel,
{ {
const char *nick, *prefixes; const char *nick, *prefixes;
int op, halfop, voice; int op, halfop, voice;
NICK_REC *nickrec;
char newprefixes[MAX_USER_PREFIXES + 1]; char newprefixes[MAX_USER_PREFIXES + 1];
int i; int i;
@ -145,7 +144,7 @@ static void sig_session_restore_nick(IRC_CHANNEL_REC *channel,
newprefixes[i] = '\0'; newprefixes[i] = '\0';
prefixes = newprefixes; 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) static void session_restore_channel(IRC_CHANNEL_REC *channel)

View file

@ -24,6 +24,7 @@
#include "servers-redirect.h" #include "servers-redirect.h"
#include "levels.h" #include "levels.h"
#include "settings.h" #include "settings.h"
#include "misc.h"
#include "irc.h" #include "irc.h"
#include "irc-channels.h" #include "irc-channels.h"