Convert lookup_userlevelc() to accept const char * parameters
Also converted dependant functions check_channel_match() and find_bestmatch() to use const char *.
This commit is contained in:
parent
51ecdb8d1b
commit
a24f1d12ec
|
@ -15,7 +15,7 @@ void savelists (char *, char *, char *, char *);
|
|||
|
||||
void add_to_a_list (char *, int, char *, char *, char *, int);
|
||||
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 *);
|
||||
ShitList *nickinshit (char *, char *);
|
||||
|
@ -27,7 +27,7 @@ NickList *check_auto (char *, NickList *, ChannelList *);
|
|||
int check_prot (char *, char *, ChannelList *, BanList *, NickList *);
|
||||
void check_shit (ChannelList *);
|
||||
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 *);
|
||||
|
||||
|
||||
|
@ -72,7 +72,7 @@ extern WordKickList *ban_words;
|
|||
#define SHIT_IGNORE 0x0010
|
||||
|
||||
/* 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);
|
||||
UserList *find_userlist(char *, char *, int);
|
||||
void add_userlist(UserList *);
|
||||
|
|
|
@ -23,7 +23,7 @@ HashEntry UserListByChannel_Table[USERCHAN_HASHSIZE];
|
|||
|
||||
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;
|
||||
unsigned long g, hash = 0;
|
||||
|
@ -359,26 +359,26 @@ UserHist *next_userlist(UserList *uptr, int *size)
|
|||
}
|
||||
#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)
|
||||
return !checkpass(test, passwd) ? 1 : 0;
|
||||
return !checkpass(test, passwd);
|
||||
/* return !strcmp(passwd, test) ? 1 : 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_passwd = NULL;
|
||||
register UserList *tmp;
|
||||
long hvalue = 0;
|
||||
int best_user_match = 0,
|
||||
best_chan_match = 0;
|
||||
int chan_match,
|
||||
user_match,
|
||||
passwd_match = 0;
|
||||
char *check;
|
||||
UserList *best = NULL;
|
||||
UserList *best_passwd = NULL;
|
||||
UserList *tmp;
|
||||
long hvalue = 0;
|
||||
int best_user_match = 0,
|
||||
best_chan_match = 0;
|
||||
int chan_match,
|
||||
user_match,
|
||||
passwd_match = 0;
|
||||
const char *check;
|
||||
|
||||
/*check = clear_server_flags(userhost);*/
|
||||
check = userhost;
|
||||
|
|
|
@ -842,7 +842,7 @@ int size = -1;
|
|||
* Function courtesy of Sheik. From his CtoolZ client.
|
||||
* 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)
|
||||
|
@ -1436,15 +1436,15 @@ char err_msg[7][50] = { empty_string, "No Level Specified", "No Protection level
|
|||
}
|
||||
#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;
|
||||
if (!tmp || !channel)
|
||||
return 0;
|
||||
if (*channel == '*' && (strlen(channel)==1))
|
||||
return 1;
|
||||
q = chan = LOCAL_COPY(tmp);
|
||||
chan = LOCAL_COPY(tmp);
|
||||
|
||||
while ((p = next_in_comma_list(chan, &chan)))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue