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

Convert lookup_userlevelc() to accept const char * parameters

Browse Source 
Also converted dependant functions check_channel_match() and
find_bestmatch() to use const char *.
This commit is contained in:
Kevin Easton
2015-10-20 23:12:33 +11:00
parent 51ecdb8d1b
commit a24f1d12ec
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/userlist.h
View File

@@ -15,7 +15,7 @@ void savelists (char *, char *, char *, char *);
void add_to_a_list (char *, int, char *, char *, char *, int); void add_to_a_list (char *, int, char *, char *, char *, int);
void showlist (NickList *, char *); void showlist (NickList *, char *);
UserList *lookup_userlevelc (char *, char *, char *, char *); UserList *lookup_userlevelc (const char *, const char *, const char *, const char *);
UserList *nickinuser (char *, char *); UserList *nickinuser (char *, char *);
ShitList *nickinshit (char *, char *); ShitList *nickinshit (char *, char *);
@@ -27,7 +27,7 @@ NickList *check_auto (char *, NickList *, ChannelList *);
int check_prot (char *, char *, ChannelList *, BanList *, NickList *); int check_prot (char *, char *, ChannelList *, BanList *, NickList *);
void check_shit (ChannelList *); void check_shit (ChannelList *);
void check_hack (char *, ChannelList *, NickList *, char *); void check_hack (char *, ChannelList *, NickList *, char *);
int check_channel_match (char *, char *); int check_channel_match (const char *, const char *);
int delay_check_auto (char *); int delay_check_auto (char *);
@@ -72,7 +72,7 @@ extern WordKickList *ban_words;
#define SHIT_IGNORE 0x0010 #define SHIT_IGNORE 0x0010
/* user.c functions for dealing with hashed userlist */ /* user.c functions for dealing with hashed userlist */
UserList *find_bestmatch(char *, char *, char *, char *); UserList *find_bestmatch(const char *, const char *, const char *, const char *);
char * convert_flags(unsigned long flags); char * convert_flags(unsigned long flags);
UserList *find_userlist(char *, char *, int); UserList *find_userlist(char *, char *, int);
void add_userlist(UserList *); void add_userlist(UserList *);

28
source/user.c
View File

@@ -23,7 +23,7 @@ HashEntry UserListByChannel_Table[USERCHAN_HASHSIZE];
UserList *user_list = NULL; UserList *user_list = NULL;
static long hash_name(char *str, unsigned int size) static long hash_name(const char *str, unsigned int size)
{ {
const unsigned char *p = (const unsigned char *)str; const unsigned char *p = (const unsigned char *)str;
unsigned long g, hash = 0; unsigned long g, hash = 0;
@@ -359,26 +359,26 @@ UserHist *next_userlist(UserList *uptr, int *size)
} }
#endif #endif
static inline int check_best_passwd(char *passwd, char *test) static inline int check_best_passwd(const char *passwd, const char *test)
{ {
if (passwd && test) if (passwd && test)
return !checkpass(test, passwd) ? 1 : 0; return !checkpass(test, passwd);
/* return !strcmp(passwd, test) ? 1 : 0;*/ /* return !strcmp(passwd, test) ? 1 : 0;*/
return 0; return 0;
} }
UserList *find_bestmatch(char *nick, char *userhost, char *channel, char *passwd) UserList *find_bestmatch(const char *nick, const char *userhost, const char *channel, const char *passwd)
{ {
UserList *best = NULL; UserList *best = NULL;
UserList *best_passwd = NULL; UserList *best_passwd = NULL;
register UserList *tmp; UserList *tmp;
long hvalue = 0; long hvalue = 0;
int best_user_match = 0, int best_user_match = 0,
best_chan_match = 0; best_chan_match = 0;
int chan_match, int chan_match,
user_match, user_match,
passwd_match = 0; passwd_match = 0;
char *check; const char *check;
/*check = clear_server_flags(userhost);*/ /*check = clear_server_flags(userhost);*/
check = userhost; check = userhost;

8
source/userlist.c
View File

@@ -842,7 +842,7 @@ int size = -1;
* Function courtesy of Sheik. From his CtoolZ client. * Function courtesy of Sheik. From his CtoolZ client.
* but modified a little by panasync * but modified a little by panasync
*/ */
UserList *lookup_userlevelc(char *nick, char *userhost, char *channel, char *passwd) UserList *lookup_userlevelc(const char *nick, const char *userhost, const char *channel, const char *passwd)
{ {
if (!nick || !userhost || !*userhost || !channel) if (!nick || !userhost || !*userhost || !channel)
@@ -1436,15 +1436,15 @@ char err_msg[7][50] = { empty_string, "No Level Specified", "No Protection level
} }
#endif #endif
int check_channel_match(char *tmp, char *channel) int check_channel_match(const char *tmp, const char *channel)
{ {
char *p, *q, *chan = NULL; char *p, *chan = NULL;
int wmatch = 0; int wmatch = 0;
if (!tmp || !channel) if (!tmp || !channel)
return 0; return 0;
if (*channel == '*' && (strlen(channel)==1)) if (*channel == '*' && (strlen(channel)==1))
return 1; return 1;
q = chan = LOCAL_COPY(tmp); chan = LOCAL_COPY(tmp);
while ((p = next_in_comma_list(chan, &chan))) while ((p = next_in_comma_list(chan, &chan)))
{ {