diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/irc/irc-command.c | 3 | ||||
| -rw-r--r-- | src/plugins/irc/irc-info.c | 3 | ||||
| -rw-r--r-- | src/plugins/irc/irc-mode.c | 4 | ||||
| -rw-r--r-- | src/plugins/irc/irc-modelist.c | 4 | ||||
| -rw-r--r-- | src/plugins/irc/irc-modelist.h | 8 |
5 files changed, 12 insertions, 10 deletions
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 65c48fd17..1b0709c04 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -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); } diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c index 1eaab8711..13d663a67 100644 --- a/src/plugins/irc/irc-info.c +++ b/src/plugins/irc/irc-info.c @@ -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); diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c index b90aacfd5..b5d525c6c 100644 --- a/src/plugins/irc/irc-mode.c +++ b/src/plugins/irc/irc-mode.c @@ -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); } diff --git a/src/plugins/irc/irc-modelist.c b/src/plugins/irc/irc-modelist.c index 6b814ca92..d21b34971 100644 --- a/src/plugins/irc/irc-modelist.c +++ b/src/plugins/irc/irc-modelist.c @@ -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; diff --git a/src/plugins/irc/irc-modelist.h b/src/plugins/irc/irc-modelist.h index 3f9eee869..1648ef9eb 100644 --- a/src/plugins/irc/irc-modelist.h +++ b/src/plugins/irc/irc-modelist.h @@ -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, |