philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused 'unlink' argument from check_whowas_nick_buffer()

Browse Source 
Every caller was passing 0 for unlink, so remove it.  This simplifies the function.

Also change the nick and channel arguments to const char *.
This commit is contained in:
Kevin Easton
2017-02-22 22:28:17 +11:00
parent 0c721de2a5
commit 2363ea709d
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/whowas.h
View File

@@ -39,7 +39,7 @@ typedef struct _whowas_wrap_str {
} WhowasWrapList; } WhowasWrapList;
WhowasList *check_whowas_buffer (char *, char *, char *); WhowasList *check_whowas_buffer (char *, char *, char *);
WhowasList *check_whowas_nick_buffer (char *, char *, int); WhowasList *check_whowas_nick_buffer(const char *, const char *);
WhowasList *check_whosplitin_buffer (char *, char *, char *, int); WhowasList *check_whosplitin_buffer (char *, char *, char *, int);
void add_to_whowas_buffer (NickList *, char *, char *, char *); void add_to_whowas_buffer (NickList *, char *, char *, char *);

4
source/banlist.c
View File

@@ -305,7 +305,7 @@ void userhost_unban(UserhostItem *stuff, char *nick1, char *args)
if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1)) if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1))
{ {
if ((whowas = check_whowas_nick_buffer(nick1, args, 0))) if ((whowas = check_whowas_nick_buffer(nick1, args)))
{ {
malloc_sprintf(&host, "%s!%s", whowas->nicklist->nick, whowas->nicklist->host); malloc_sprintf(&host, "%s!%s", whowas->nicklist->nick, whowas->nicklist->host);
bitchsay("Using WhoWas info for unban of %s ", nick1); bitchsay("Using WhoWas info for unban of %s ", nick1);
@@ -369,7 +369,7 @@ void userhost_ban(UserhostItem *stuff, char *nick1, char *args)
if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1)) if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1))
{ {
if (channel && (whowas = check_whowas_nick_buffer(nick1, channel, 0))) if (channel && (whowas = check_whowas_nick_buffer(nick1, channel)))
{ {
nick = whowas->nicklist->nick; nick = whowas->nicklist->nick;
user = m_strdup(clear_server_flags(whowas->nicklist->host)); user = m_strdup(clear_server_flags(whowas->nicklist->host));

2
source/misc.c
View File

@@ -3842,7 +3842,7 @@ void userhost_ignore (UserhostItem *stuff, char *nick1, char *args)
arg = next_arg(args, &args); arg = next_arg(args, &args);
if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1)) if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1))
{ {
if ((whowas = check_whowas_nick_buffer(nick1, arg, 0))) if ((whowas = check_whowas_nick_buffer(nick1, arg)))
{ {
bitchsay("Using WhoWas info for %s of %s ", arg, nick1); bitchsay("Using WhoWas info for %s of %s ", arg, nick1);
user = host; host = strchr(host, '@'); *host++ = 0; user = host; host = strchr(host, '@'); *host++ = 0;

21
source/whowas.c
View File

@@ -77,34 +77,25 @@ extern WhowasList *check_whowas_buffer(char *nick, char *userhost, char *channel
} }
extern WhowasList * check_whowas_nick_buffer(char *nick, char *channel, int unlink) WhowasList *check_whowas_nick_buffer(const char *nick, const char *channel)
{ {
WhowasList *tmp = NULL, *last = NULL; WhowasList *tmp = NULL;
for (tmp = next_userhost(&whowas_userlist_list, NULL); tmp; tmp = next_userhost(&whowas_userlist_list, tmp)) for (tmp = next_userhost(&whowas_userlist_list, NULL); tmp; tmp = next_userhost(&whowas_userlist_list, tmp))
{ {
if (!my_stricmp(tmp->nicklist->nick, nick) && !my_stricmp(tmp->channel, channel)) if (!my_stricmp(tmp->nicklist->nick, nick) && !my_stricmp(tmp->channel, channel))
{ {
if (unlink) return tmp;
{
last = find_userhost_channel(tmp->nicklist->host, tmp->channel, 1, &whowas_userlist_list);
tmp = NULL;
}
return last?last:tmp;
} }
} }
for (tmp = next_userhost(&whowas_reg_list, NULL); tmp; tmp = next_userhost(&whowas_reg_list, tmp)) for (tmp = next_userhost(&whowas_reg_list, NULL); tmp; tmp = next_userhost(&whowas_reg_list, tmp))
{ {
if (!my_stricmp(tmp->nicklist->nick, nick) && !my_stricmp(tmp->channel, channel)) if (!my_stricmp(tmp->nicklist->nick, nick) && !my_stricmp(tmp->channel, channel))
{ {
if (unlink) return tmp;
{
last = find_userhost_channel(tmp->nicklist->host, tmp->channel, 1, &whowas_reg_list);
tmp = NULL;
}
return last?last:tmp;
} }
} }
return( NULL ); return NULL;
} }
extern WhowasList * check_whosplitin_buffer(char *nick, char *userhost, char *channel, int unlink) extern WhowasList * check_whosplitin_buffer(char *nick, char *userhost, char *channel, int unlink)