mirror of
https://github.com/irssi/irssi.git
synced 2026-08-11 21:00:40 +02:00
Enabled lots of GCC warnings, fixed those that were easy to fix.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@456 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
f8aa81b73c
commit
dcc2e89b2e
25 changed files with 84 additions and 106 deletions
|
|
@ -67,17 +67,23 @@ static void ctcp_time_msg(const char *data, IRC_SERVER_REC *server, const char *
|
|||
|
||||
static void ctcp_default_reply(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr, const char *target)
|
||||
{
|
||||
char *ptr, *str;
|
||||
const char *ctcpdata;
|
||||
char *ctcp, *ptr;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
str = g_strdup(data);
|
||||
ptr = strchr(str, ' ');
|
||||
if (ptr != NULL) *ptr++ = '\0'; else ptr = "";
|
||||
ctcp = g_strdup(data);
|
||||
ptr = strchr(ctcp, ' ');
|
||||
if (ptr == NULL)
|
||||
ctcpdata = "";
|
||||
else {
|
||||
*ptr = '\0';
|
||||
ctcpdata = ptr+1;
|
||||
}
|
||||
|
||||
printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS,
|
||||
ischannel(*target) ? IRCTXT_CTCP_REPLY_CHANNEL : IRCTXT_CTCP_REPLY, str, nick, ptr, target);
|
||||
g_free(str);
|
||||
ischannel(*target) ? IRCTXT_CTCP_REPLY_CHANNEL : IRCTXT_CTCP_REPLY, ctcp, nick, ctcpdata, target);
|
||||
g_free(ctcp);
|
||||
}
|
||||
|
||||
static void ctcp_ping_reply(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr, const char *target)
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@ static void print_channel_msg(IRC_SERVER_REC *server, const char *msg,
|
|||
CHANNEL_REC *chanrec;
|
||||
NICK_REC *nickrec;
|
||||
int for_me;
|
||||
char *color, *nickmode;
|
||||
const char *nickmode;
|
||||
char *color;
|
||||
|
||||
chanrec = channel_find(server, target);
|
||||
for_me = irc_nick_match(server->nick, msg);
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ static void cmd_ignore(const char *data)
|
|||
|
||||
if (ischannel(*mask)) {
|
||||
chanarg = mask;
|
||||
mask = "";
|
||||
mask = NULL;
|
||||
}
|
||||
channels = (chanarg == NULL || *chanarg == '\0') ? NULL :
|
||||
g_strsplit(replace_chars(chanarg, ',', ' '), " ", -1);
|
||||
|
|
@ -176,7 +176,8 @@ static void cmd_ignore(const char *data)
|
|||
if (rec == NULL) {
|
||||
rec = g_new0(IGNORE_REC, 1);
|
||||
|
||||
rec->mask = *mask == '\0' ? NULL : g_strdup(mask);
|
||||
rec->mask = (mask != NULL && *mask != '\0') ?
|
||||
g_strdup(mask) : NULL;
|
||||
rec->channels = channels;
|
||||
} else {
|
||||
g_free_and_null(rec->pattern);
|
||||
|
|
@ -226,10 +227,10 @@ static void cmd_unignore(const char *data)
|
|||
rec = tmp == NULL ? NULL : tmp->data;
|
||||
} else {
|
||||
/* with mask */
|
||||
char *chans[2] = { "*", NULL };
|
||||
const char *chans[2] = { "*", NULL };
|
||||
|
||||
if (ischannel(*data)) chans[0] = (char *) data;
|
||||
rec = ignore_find("*", ischannel(*data) ? NULL : data, chans);
|
||||
if (ischannel(*data)) chans[0] = data;
|
||||
rec = ignore_find("*", ischannel(*data) ? NULL : data, (char **) chans);
|
||||
}
|
||||
|
||||
if (rec == NULL)
|
||||
|
|
|
|||
|
|
@ -95,7 +95,8 @@ static void cmd_msg(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
|
|||
WINDOW_REC *window;
|
||||
CHANNEL_REC *channel;
|
||||
NICK_REC *nickrec;
|
||||
char *target, *msg, *nickmode, *freestr, *newtarget;
|
||||
const char *nickmode;
|
||||
char *target, *msg, *freestr, *newtarget;
|
||||
void *free_arg;
|
||||
int free_ret;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue