1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-07 18:23:13 +02:00

irc: rename functions to search modelist items

This commit is contained in:
Sébastien Helleu
2018-03-25 10:05:58 +02:00
parent 8f3c9a7378
commit 0d74b03004
5 changed files with 12 additions and 10 deletions
+2 -1
View File
@@ -285,7 +285,8 @@ irc_command_mode_masks (struct t_irc_server *server,
number = strtol (argv[pos_masks], &error, 10);
if (error && !error[0])
{
ptr_item = irc_modelist_item_number (ptr_modelist, number - 1);
ptr_item = irc_modelist_item_search_number (ptr_modelist,
number - 1);
if (ptr_item)
mask = strdup (ptr_item->mask);
}
+2 -1
View File
@@ -730,7 +730,8 @@ irc_info_infolist_irc_modelist_item_cb (const void *pointer, void *data,
weechat_string_free_split (argv);
return NULL;
}
obj_pointer = irc_modelist_item_number (ptr_modelist, (int)number);
obj_pointer = irc_modelist_item_search_number (ptr_modelist,
(int)number);
if (!obj_pointer)
{
weechat_string_free_split (argv);
+2 -2
View File
@@ -482,8 +482,8 @@ irc_mode_channel_set (struct t_irc_server *server,
}
else if (set_flag == '-')
{
ptr_item = irc_modelist_item_search (ptr_modelist,
ptr_arg);
ptr_item = irc_modelist_item_search_mask (
ptr_modelist, ptr_arg);
if (ptr_item)
irc_modelist_item_free (ptr_modelist, ptr_item);
}
+2 -2
View File
@@ -206,7 +206,7 @@ irc_modelist_item_valid (struct t_irc_modelist *modelist,
*/
struct t_irc_modelist_item *
irc_modelist_item_search (struct t_irc_modelist *modelist, const char *mask)
irc_modelist_item_search_mask (struct t_irc_modelist *modelist, const char *mask)
{
struct t_irc_modelist_item *ptr_item;
@@ -229,7 +229,7 @@ irc_modelist_item_search (struct t_irc_modelist *modelist, const char *mask)
*/
struct t_irc_modelist_item *
irc_modelist_item_number (struct t_irc_modelist *modelist, int number)
irc_modelist_item_search_number (struct t_irc_modelist *modelist, int number)
{
struct t_irc_modelist_item *ptr_item;
+4 -4
View File
@@ -66,10 +66,10 @@ extern void irc_modelist_free_all (struct t_irc_channel *channel);
extern int irc_modelist_item_valid (struct t_irc_modelist *modelist,
struct t_irc_modelist_item *item);
extern struct t_irc_modelist_item *irc_modelist_item_search (struct t_irc_modelist *modelist,
const char *mask);
extern struct t_irc_modelist_item *irc_modelist_item_number (struct t_irc_modelist *modelist,
int number);
extern struct t_irc_modelist_item *irc_modelist_item_search_mask (struct t_irc_modelist *modelist,
const char *mask);
extern struct t_irc_modelist_item *irc_modelist_item_search_number (struct t_irc_modelist *modelist,
int number);
extern struct t_irc_modelist_item *irc_modelist_item_new (struct t_irc_modelist *modelist,
const char *mask,
const char *setter,