irc: split info/infolist callbacks

1 files changed, 699 insertions, 474 deletions

diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c
index 83ec5be01..744675134 100644
--- a/src/plugins/irc/irc-info.c
+++ b/src/plugins/irc/irc-info.c
@@ -60,193 +60,332 @@ irc_info_create_string_with_pointer (char **string, void *pointer)
 }
 
 /*
- * Returns IRC info.
+ * Returns IRC info "irc_is_channel".
  */
 
 const char *
-irc_info_get_info_cb (void *data, const char *info_name,
-                      const char *arguments)
+irc_info_info_irc_is_channel_cb (void *data, const char *info_name,
+                                 const char *arguments)
 {
-    char *pos_comma, *pos_comma2, *server, *channel, *host;
-    const char *nick, *pos_channel, *isupport_value;
+    char *pos_comma, *server;
+    const char *pos_channel;
     static char str_true[2] = "1";
     struct t_irc_server *ptr_server;
-    struct t_irc_channel *ptr_channel;
 
     /* make C compiler happy */
     (void) data;
+    (void) info_name;
 
-    if (weechat_strcasecmp (info_name, "irc_is_channel") == 0)
+    ptr_server = NULL;
+    pos_channel = arguments;
+    pos_comma = strchr (arguments, ',');
+    if (pos_comma)
     {
-        ptr_server = NULL;
-        pos_channel = arguments;
-        pos_comma = strchr (arguments, ',');
-        if (pos_comma)
+        pos_channel = pos_comma + 1;
+        server = weechat_strndup (arguments, pos_comma - arguments);
+        if (server)
         {
-            pos_channel = pos_comma + 1;
-            server = weechat_strndup (arguments, pos_comma - arguments);
-            if (server)
-            {
-                ptr_server = irc_server_search (server);
-                free (server);
-            }
+            ptr_server = irc_server_search (server);
+            free (server);
         }
-        if (irc_channel_is_channel (ptr_server, pos_channel))
-            return str_true;
-        return NULL;
     }
-    else if (weechat_strcasecmp (info_name, "irc_is_nick") == 0)
-    {
-        if (irc_nick_is_nick (arguments))
-            return str_true;
+    if (irc_channel_is_channel (ptr_server, pos_channel))
+        return str_true;
+    return NULL;
+}
+
+/*
+ * Returns IRC info "irc_is_nick".
+ */
+
+const char *
+irc_info_info_irc_is_nick_cb (void *data, const char *info_name,
+                              const char *arguments)
+{
+    static char str_true[2] = "1";
+
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    if (arguments && arguments[0] && irc_nick_is_nick (arguments))
+        return str_true;
+    return NULL;
+}
+
+/*
+ * Returns IRC info "irc_nick".
+ */
+
+const char *
+irc_info_info_irc_nick_cb (void *data, const char *info_name,
+                           const char *arguments)
+{
+    struct t_irc_server *ptr_server;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    if (!arguments || !arguments[0])
         return NULL;
-    }
-    else if (weechat_strcasecmp (info_name, "irc_nick") == 0)
-    {
-        ptr_server = irc_server_search (arguments);
-        if (ptr_server)
-            return ptr_server->nick;
+
+    ptr_server = irc_server_search (arguments);
+    if (ptr_server)
+        return ptr_server->nick;
+
+    return NULL;
+}
+
+/*
+ * Returns IRC info "irc_nick_from_host".
+ */
+
+const char *
+irc_info_info_irc_nick_from_host_cb (void *data, const char *info_name,
+                                     const char *arguments)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    return (arguments && arguments[0]) ?
+        irc_message_get_nick_from_host (arguments) : NULL;
+}
+
+/*
+ * Returns IRC info "irc_nick_color".
+ */
+
+const char *
+irc_info_info_irc_nick_color_cb (void *data, const char *info_name,
+                                 const char *arguments)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    return (arguments && arguments[0]) ?
+        irc_nick_find_color (arguments) : NULL;
+}
+
+/*
+ * Returns IRC info "irc_nick_color_name".
+ */
+
+const char *
+irc_info_info_irc_nick_color_name_cb (void *data, const char *info_name,
+                                      const char *arguments)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    return (arguments && arguments[0]) ?
+        irc_nick_find_color_name (arguments) : NULL;
+}
+
+/*
+ * Returns IRC info "irc_buffer".
+ */
+
+const char *
+irc_info_info_irc_buffer_cb (void *data, const char *info_name,
+                             const char *arguments)
+{
+    char *pos_comma, *pos_comma2, *server, *channel, *host;
+    const char *nick;
+    struct t_irc_server *ptr_server;
+    struct t_irc_channel *ptr_channel;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    if (!arguments || !arguments[0])
         return NULL;
-    }
-    else if (weechat_strcasecmp (info_name, "irc_nick_from_host") == 0)
-    {
-        return irc_message_get_nick_from_host (arguments);
-    }
-    else if (weechat_strcasecmp (info_name, "irc_nick_color") == 0)
+
+    server = NULL;
+    channel = NULL;
+    host = NULL;
+    ptr_server = NULL;
+    ptr_channel = NULL;
+
+    pos_comma = strchr (arguments, ',');
+    if (pos_comma)
     {
-        return irc_nick_find_color (arguments);
+        server = weechat_strndup (arguments, pos_comma - arguments);
+        pos_comma2 = strchr (pos_comma + 1, ',');
+        if (pos_comma2)
+        {
+            channel = weechat_strndup (pos_comma + 1,
+                                       pos_comma2 - pos_comma - 1);
+            host = strdup (pos_comma2 + 1);
+        }
+        else
+            channel = strdup (pos_comma + 1);
     }
-    else if (weechat_strcasecmp (info_name, "irc_nick_color_name") == 0)
+    else
     {
-        return irc_nick_find_color_name (arguments);
+        if (irc_server_search (arguments))
+            server = strdup (arguments);
+        else
+            channel = strdup (arguments);
     }
-    else if (weechat_strcasecmp (info_name, "irc_buffer") == 0)
+    if (server)
+        ptr_server = irc_server_search (server);
+
+    /*
+     * replace channel by nick in host if channel is not a channel
+     * (private ?)
+     */
+    if (channel && host)
     {
-        if (arguments && arguments[0])
+        if (!irc_channel_is_channel (ptr_server, channel))
         {
-            server = NULL;
+            free (channel);
             channel = NULL;
-            host = NULL;
-            ptr_server = NULL;
-            ptr_channel = NULL;
+            nick = irc_message_get_nick_from_host (host);
+            if (nick)
+                channel = strdup (nick);
+        }
+    }
 
-            pos_comma = strchr (arguments, ',');
-            if (pos_comma)
-            {
-                server = weechat_strndup (arguments, pos_comma - arguments);
-                pos_comma2 = strchr (pos_comma + 1, ',');
-                if (pos_comma2)
-                {
-                    channel = weechat_strndup (pos_comma + 1,
-                                               pos_comma2 - pos_comma - 1);
-                    host = strdup (pos_comma2 + 1);
-                }
-                else
-                    channel = strdup (pos_comma + 1);
-            }
-            else
-            {
-                if (irc_server_search (arguments))
-                    server = strdup (arguments);
-                else
-                    channel = strdup (arguments);
-            }
-            if (server)
-                ptr_server = irc_server_search (server);
-
-            /*
-             * replace channel by nick in host if channel is not a channel
-             * (private ?)
-             */
-            if (channel && host)
-            {
-                if (!irc_channel_is_channel (ptr_server, channel))
-                {
-                    free (channel);
-                    channel = NULL;
-                    nick = irc_message_get_nick_from_host (host);
-                    if (nick)
-                        channel = strdup (nick);
+    /* search for server or channel buffer */
+    if (server && ptr_server && channel)
+        ptr_channel = irc_channel_search (ptr_server, channel);
 
-                }
-            }
+    if (server)
+        free (server);
+    if (channel)
+        free (channel);
+    if (host)
+        free (host);
 
-            /* search for server or channel buffer */
-            if (server && ptr_server && channel)
-                ptr_channel = irc_channel_search (ptr_server, channel);
+    if (ptr_channel)
+    {
+        irc_info_create_string_with_pointer (&ptr_channel->buffer_as_string,
+                                             ptr_channel->buffer);
+        return ptr_channel->buffer_as_string;
+    }
+    if (ptr_server)
+    {
+        irc_info_create_string_with_pointer (&ptr_server->buffer_as_string,
+                                             ptr_server->buffer);
+        return ptr_server->buffer_as_string;
+    }
+    return NULL;
+}
 
-            if (server)
-                free (server);
-            if (channel)
-                free (channel);
-            if (host)
-                free (host);
+/*
+ * Returns IRC info "irc_server_isupport".
+ */
 
-            if (ptr_channel)
-            {
-                irc_info_create_string_with_pointer (&ptr_channel->buffer_as_string,
-                                                     ptr_channel->buffer);
-                return ptr_channel->buffer_as_string;
-            }
+const char *
+irc_info_info_irc_server_isupport_cb (void *data, const char *info_name,
+                                      const char *arguments)
+{
+    char *pos_comma, *server;
+    const char *isupport_value;
+    static char str_true[2] = "1";
+    struct t_irc_server *ptr_server;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    isupport_value = NULL;
+    pos_comma = strchr (arguments, ',');
+    if (pos_comma)
+    {
+        server = weechat_strndup (arguments, pos_comma - arguments);
+        if (server)
+        {
+            ptr_server = irc_server_search (server);
             if (ptr_server)
             {
-                irc_info_create_string_with_pointer (&ptr_server->buffer_as_string,
-                                                     ptr_server->buffer);
-                return ptr_server->buffer_as_string;
+                isupport_value = irc_server_get_isupport_value (ptr_server,
+                                                                pos_comma + 1);
             }
         }
     }
-    else if (weechat_strcasecmp (info_name, "irc_server_isupport") == 0)
+    return (isupport_value) ? str_true : NULL;
+}
+
+/*
+ * Returns IRC info "irc_server_isupport_value".
+ */
+
+const char *
+irc_info_info_irc_server_isupport_value_cb (void *data, const char *info_name,
+                                            const char *arguments)
+{
+    char *pos_comma, *server;
+    const char *isupport_value;
+    struct t_irc_server *ptr_server;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    isupport_value = NULL;
+    pos_comma = strchr (arguments, ',');
+    if (pos_comma)
     {
-        isupport_value = NULL;
-        pos_comma = strchr (arguments, ',');
-        if (pos_comma)
+        server = weechat_strndup (arguments, pos_comma - arguments);
+        if (server)
         {
-            server = weechat_strndup (arguments, pos_comma - arguments);
-            if (server)
+            ptr_server = irc_server_search (server);
+            if (ptr_server)
             {
-                ptr_server = irc_server_search (server);
-                if (ptr_server)
-                {
-                    isupport_value = irc_server_get_isupport_value (ptr_server,
-                                                                    pos_comma + 1);
-                }
+                isupport_value = irc_server_get_isupport_value (ptr_server,
+                                                                pos_comma + 1);
             }
         }
-        if (isupport_value)
-            return str_true;
-        return NULL;
     }
-    else if (weechat_strcasecmp (info_name, "irc_server_isupport_value") == 0)
+    return isupport_value;
+}
+
+/*
+ * Returns IRC info with hashtable "irc_message_parse".
+ */
+
+struct t_hashtable *
+irc_info_info_hashtable_irc_message_parse_cb (void *data,
+                                              const char *info_name,
+                                              struct t_hashtable *hashtable)
+{
+    const char *server, *message;
+    struct t_irc_server *ptr_server;
+    struct t_hashtable *value;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) info_name;
+
+    if (!hashtable)
+        return NULL;
+
+    server = weechat_hashtable_get (hashtable, "server");
+    ptr_server = (server) ? irc_server_search (server) : NULL;
+    message = weechat_hashtable_get (hashtable, "message");
+    if (message)
     {
-        isupport_value = NULL;
-        pos_comma = strchr (arguments, ',');
-        if (pos_comma)
-        {
-            server = weechat_strndup (arguments, pos_comma - arguments);
-            if (server)
-            {
-                ptr_server = irc_server_search (server);
-                if (ptr_server)
-                {
-                    isupport_value = irc_server_get_isupport_value (ptr_server,
-                                                                    pos_comma + 1);
-                }
-            }
-        }
-        return isupport_value;
+        value = irc_message_parse_to_hashtable (ptr_server, message);
+        return value;
     }
 
     return NULL;
 }
 
 /*
- * Returns IRC info with hashtable.
+ * Returns IRC info with hashtable "irc_message_split".
  */
 
 struct t_hashtable *
-irc_info_get_info_hashtable_cb (void *data, const char *info_name,
-                                struct t_hashtable *hashtable)
+irc_info_info_hashtable_irc_message_split_cb (void *data,
+                                              const char *info_name,
+                                              struct t_hashtable *hashtable)
 {
     const char *server, *message;
     struct t_irc_server *ptr_server;
@@ -254,335 +393,398 @@ irc_info_get_info_hashtable_cb (void *data, const char *info_name,
 
     /* make C compiler happy */
     (void) data;
+    (void) info_name;
 
     if (!hashtable)
         return NULL;
 
-    if (weechat_strcasecmp (info_name, "irc_message_parse") == 0)
+    server = weechat_hashtable_get (hashtable, "server");
+    ptr_server = (server) ? irc_server_search (server) : NULL;
+    message = weechat_hashtable_get (hashtable, "message");
+    if (message)
     {
-        server = weechat_hashtable_get (hashtable, "server");
-        ptr_server = (server) ? irc_server_search (server) : NULL;
-        message = weechat_hashtable_get (hashtable, "message");
-        if (message)
+        value = irc_message_split (ptr_server, message);
+        return value;
+    }
+
+    return NULL;
+}
+
+/*
+ * Returns IRC infolist "irc_server".
+ */
+
+struct t_infolist *
+irc_info_infolist_irc_server_cb (void *data, const char *infolist_name,
+                                 void *pointer, const char *arguments)
+{
+    struct t_infolist *ptr_infolist;
+    struct t_irc_server *ptr_server;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) infolist_name;
+
+    if (pointer && !irc_server_valid (pointer))
+        return NULL;
+
+    ptr_infolist = weechat_infolist_new ();
+    if (!ptr_infolist)
+        return NULL;
+
+    if (pointer)
+    {
+        /* build list with only one server */
+        if (!irc_server_add_to_infolist (ptr_infolist, pointer))
         {
-            value = irc_message_parse_to_hashtable (ptr_server, message);
-            return value;
+            weechat_infolist_free (ptr_infolist);
+            return NULL;
         }
+        return ptr_infolist;
     }
-    else if (weechat_strcasecmp (info_name, "irc_message_split") == 0)
+    else
     {
-        server = weechat_hashtable_get (hashtable, "server");
-        ptr_server = (server) ? irc_server_search (server) : NULL;
-        message = weechat_hashtable_get (hashtable, "message");
-        if (message)
+        /* build list with all servers matching arguments */
+        for (ptr_server = irc_servers; ptr_server;
+             ptr_server = ptr_server->next_server)
         {
-            value = irc_message_split (ptr_server, message);
-            return value;
+            if (!arguments || !arguments[0]
+                || weechat_string_match (ptr_server->name, arguments, 0))
+            {
+                if (!irc_server_add_to_infolist (ptr_infolist, ptr_server))
+                {
+                    weechat_infolist_free (ptr_infolist);
+                    return NULL;
+                }
+            }
         }
+        return ptr_infolist;
     }
 
     return NULL;
 }
 
 /*
- * Returns infolist with IRC info.
+ * Returns IRC infolist "irc_channel".
  */
 
 struct t_infolist *
-irc_info_get_infolist_cb (void *data, const char *infolist_name,
-                          void *pointer, const char *arguments)
+irc_info_infolist_irc_channel_cb (void *data, const char *infolist_name,
+                                  void *pointer, const char *arguments)
 {
     struct t_infolist *ptr_infolist;
     struct t_irc_server *ptr_server;
     struct t_irc_channel *ptr_channel;
-    struct t_irc_nick *ptr_nick;
-    struct t_irc_ignore *ptr_ignore;
-    struct t_irc_notify *ptr_notify;
     char **argv;
     int argc;
 
     /* make C compiler happy */
     (void) data;
+    (void) infolist_name;
+
+    if (!arguments || !arguments[0])
+        return NULL;
 
-    if (!infolist_name || !infolist_name[0])
+    ptr_server = NULL;
+    ptr_channel = NULL;
+    argv = weechat_string_split (arguments, ",", 0, 0, &argc);
+    if (!argv)
         return NULL;
 
-    if (weechat_strcasecmp (infolist_name, "irc_server") == 0)
+    if (argc >= 1)
     {
-        if (pointer && !irc_server_valid (pointer))
+        ptr_server = irc_server_search (argv[0]);
+        if (!ptr_server)
+        {
+            weechat_string_free_split (argv);
             return NULL;
-
-        ptr_infolist = weechat_infolist_new ();
-        if (ptr_infolist)
+        }
+        if (!pointer && (argc >= 2))
         {
-            if (pointer)
-            {
-                /* build list with only one server */
-                if (!irc_server_add_to_infolist (ptr_infolist, pointer))
-                {
-                    weechat_infolist_free (ptr_infolist);
-                    return NULL;
-                }
-                return ptr_infolist;
-            }
-            else
+            pointer = irc_channel_search (ptr_server, argv[1]);
+            if (!pointer)
             {
-                /* build list with all servers matching arguments */
-                for (ptr_server = irc_servers; ptr_server;
-                     ptr_server = ptr_server->next_server)
-                {
-                    if (!arguments || !arguments[0]
-                        || weechat_string_match (ptr_server->name, arguments, 0))
-                    {
-                        if (!irc_server_add_to_infolist (ptr_infolist, ptr_server))
-                        {
-                            weechat_infolist_free (ptr_infolist);
-                            return NULL;
-                        }
-                    }
-                }
-                return ptr_infolist;
+                weechat_string_free_split (argv);
+                return NULL;
             }
         }
     }
-    else if (weechat_strcasecmp (infolist_name, "irc_channel") == 0)
+    weechat_string_free_split (argv);
+
+    if (!ptr_server)
+        return NULL;
+
+    if (pointer && !irc_channel_valid (ptr_server, pointer))
+        return NULL;
+
+    ptr_infolist = weechat_infolist_new ();
+    if (!ptr_infolist)
+        return NULL;
+
+    if (pointer)
+    {
+        /* build list with only one channel */
+        if (!irc_channel_add_to_infolist (ptr_infolist, pointer))
+        {
+            weechat_infolist_free (ptr_infolist);
+            return NULL;
+        }
+        return ptr_infolist;
+    }
+    else
     {
-        if (arguments && arguments[0])
+        /* build list with all channels of server */
+        for (ptr_channel = ptr_server->channels; ptr_channel;
+             ptr_channel = ptr_channel->next_channel)
         {
-            ptr_server = NULL;
-            ptr_channel = NULL;
-            argv = weechat_string_split (arguments, ",", 0, 0, &argc);
-            if (argv)
+            if (!irc_channel_add_to_infolist (ptr_infolist, ptr_channel))
             {
-                if (argc >= 1)
-                {
-                    ptr_server = irc_server_search (argv[0]);
-                    if (!ptr_server)
-                    {
-                        weechat_string_free_split (argv);
-                        return NULL;
-                    }
-                    if (!pointer && (argc >= 2))
-                    {
-                        pointer = irc_channel_search (ptr_server, argv[1]);
-                        if (!pointer)
-                        {
-                            weechat_string_free_split (argv);
-                            return NULL;
-                        }
-                    }
-                }
-                weechat_string_free_split (argv);
-                if (ptr_server)
-                {
-                    if (pointer && !irc_channel_valid (ptr_server, pointer))
-                        return NULL;
-
-                    ptr_infolist = weechat_infolist_new ();
-                    if (ptr_infolist)
-                    {
-                        if (pointer)
-                        {
-                            /* build list with only one channel */
-                            if (!irc_channel_add_to_infolist (ptr_infolist,
-                                                              pointer))
-                            {
-                                weechat_infolist_free (ptr_infolist);
-                                return NULL;
-                            }
-                            return ptr_infolist;
-                        }
-                        else
-                        {
-                            /* build list with all channels of server */
-                            for (ptr_channel = ptr_server->channels;
-                                 ptr_channel;
-                                 ptr_channel = ptr_channel->next_channel)
-                            {
-                                if (!irc_channel_add_to_infolist (ptr_infolist,
-                                                                  ptr_channel))
-                                {
-                                    weechat_infolist_free (ptr_infolist);
-                                    return NULL;
-                                }
-                            }
-                            return ptr_infolist;
-                        }
-                    }
-                }
+                weechat_infolist_free (ptr_infolist);
+                return NULL;
             }
         }
+        return ptr_infolist;
     }
-    else if (weechat_strcasecmp (infolist_name, "irc_nick") == 0)
+
+    return NULL;
+}
+
+/*
+ * Returns IRC infolist "irc_nick".
+ */
+
+struct t_infolist *
+irc_info_infolist_irc_nick_cb (void *data, const char *infolist_name,
+                               void *pointer, const char *arguments)
+{
+    struct t_infolist *ptr_infolist;
+    struct t_irc_server *ptr_server;
+    struct t_irc_channel *ptr_channel;
+    struct t_irc_nick *ptr_nick;
+    char **argv;
+    int argc;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) infolist_name;
+
+    if (!arguments || !arguments[0])
+        return NULL;
+
+    ptr_server = NULL;
+    ptr_channel = NULL;
+    argv = weechat_string_split (arguments, ",", 0, 0, &argc);
+    if (!argv)
+        return NULL;
+
+    if (argc >= 2)
     {
-        if (arguments && arguments[0])
+        ptr_server = irc_server_search (argv[0]);
+        if (!ptr_server)
         {
-            ptr_server = NULL;
-            ptr_channel = NULL;
-            argv = weechat_string_split (arguments, ",", 0, 0, &argc);
-            if (argv)
+            weechat_string_free_split (argv);
+            return NULL;
+        }
+        ptr_channel = irc_channel_search (ptr_server, argv[1]);
+        if (!ptr_channel)
+        {
+            weechat_string_free_split (argv);
+            return NULL;
+        }
+        if (!pointer && (argc >= 3))
+        {
+            pointer = irc_nick_search (ptr_server, ptr_channel,
+                                       argv[2]);
+            if (!pointer)
             {
-                if (argc >= 2)
-                {
-                    ptr_server = irc_server_search (argv[0]);
-                    if (!ptr_server)
-                    {
-                        weechat_string_free_split (argv);
-                        return NULL;
-                    }
-                    ptr_channel = irc_channel_search (ptr_server, argv[1]);
-                    if (!ptr_channel)
-                    {
-                        weechat_string_free_split (argv);
-                        return NULL;
-                    }
-                    if (!pointer && (argc >= 3))
-                    {
-                        pointer = irc_nick_search (ptr_server, ptr_channel,
-                                                   argv[2]);
-                        if (!pointer)
-                        {
-                            weechat_string_free_split (argv);
-                            return NULL;
-                        }
-                    }
-                }
                 weechat_string_free_split (argv);
-                if (ptr_server && ptr_channel)
-                {
-                    if (pointer && !irc_nick_valid (ptr_channel, pointer))
-                        return NULL;
-
-                    ptr_infolist = weechat_infolist_new ();
-                    if (ptr_infolist)
-                    {
-                        if (pointer)
-                        {
-                            /* build list with only one nick */
-                            if (!irc_nick_add_to_infolist (ptr_infolist,
-                                                           pointer))
-                            {
-                                weechat_infolist_free (ptr_infolist);
-                                return NULL;
-                            }
-                            return ptr_infolist;
-                        }
-                        else
-                        {
-                            /* build list with all nicks of channel */
-                            for (ptr_nick = ptr_channel->nicks; ptr_nick;
-                                 ptr_nick = ptr_nick->next_nick)
-                            {
-                                if (!irc_nick_add_to_infolist (ptr_infolist,
-                                                               ptr_nick))
-                                {
-                                    weechat_infolist_free (ptr_infolist);
-                                    return NULL;
-                                }
-                            }
-                            return ptr_infolist;
-                        }
-                    }
-                }
+                return NULL;
             }
         }
     }
-    else if (weechat_strcasecmp (infolist_name, "irc_ignore") == 0)
+    weechat_string_free_split (argv);
+
+    if (!ptr_server || !ptr_channel)
+        return NULL;
+
+    if (pointer && !irc_nick_valid (ptr_channel, pointer))
+        return NULL;
+
+    ptr_infolist = weechat_infolist_new ();
+    if (!ptr_infolist)
+        return NULL;
+
+    if (pointer)
     {
-        if (pointer && !irc_ignore_valid (pointer))
+        /* build list with only one nick */
+        if (!irc_nick_add_to_infolist (ptr_infolist,
+                                       pointer))
+        {
+            weechat_infolist_free (ptr_infolist);
             return NULL;
-
-        ptr_infolist = weechat_infolist_new ();
-        if (ptr_infolist)
+        }
+        return ptr_infolist;
+    }
+    else
+    {
+        /* build list with all nicks of channel */
+        for (ptr_nick = ptr_channel->nicks; ptr_nick;
+             ptr_nick = ptr_nick->next_nick)
         {
-            if (pointer)
+            if (!irc_nick_add_to_infolist (ptr_infolist,
+                                           ptr_nick))
             {
-                /* build list with only one ignore */
-                if (!irc_ignore_add_to_infolist (ptr_infolist, pointer))
-                {
-                    weechat_infolist_free (ptr_infolist);
-                    return NULL;
-                }
-                return ptr_infolist;
-            }
-            else
-            {
-                /* build list with all ignore */
-                for (ptr_ignore = irc_ignore_list; ptr_ignore;
-                     ptr_ignore = ptr_ignore->next_ignore)
-                {
-                    if (!irc_ignore_add_to_infolist (ptr_infolist, ptr_ignore))
-                    {
-                        weechat_infolist_free (ptr_infolist);
-                        return NULL;
-                    }
-                }
-                return ptr_infolist;
+                weechat_infolist_free (ptr_infolist);
+                return NULL;
             }
         }
+        return ptr_infolist;
     }
-    else if (weechat_strcasecmp (infolist_name, "irc_notify") == 0)
+
+    return NULL;
+}
+
+/*
+ * Returns IRC infolist "irc_ignore".
+ */
+
+struct t_infolist *
+irc_info_infolist_irc_ignore_cb (void *data, const char *infolist_name,
+                                 void *pointer, const char *arguments)
+{
+    struct t_infolist *ptr_infolist;
+    struct t_irc_ignore *ptr_ignore;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) infolist_name;
+    (void) arguments;
+
+    if (pointer && !irc_ignore_valid (pointer))
+        return NULL;
+
+    ptr_infolist = weechat_infolist_new ();
+    if (!ptr_infolist)
+        return NULL;
+
+    if (pointer)
     {
-        if (pointer && !irc_notify_valid (NULL, pointer))
+        /* build list with only one ignore */
+        if (!irc_ignore_add_to_infolist (ptr_infolist, pointer))
+        {
+            weechat_infolist_free (ptr_infolist);
             return NULL;
-
-        ptr_infolist = weechat_infolist_new ();
-        if (ptr_infolist)
+        }
+        return ptr_infolist;
+    }
+    else
+    {
+        /* build list with all ignore */
+        for (ptr_ignore = irc_ignore_list; ptr_ignore;
+             ptr_ignore = ptr_ignore->next_ignore)
         {
-            if (pointer)
+            if (!irc_ignore_add_to_infolist (ptr_infolist, ptr_ignore))
             {
-                /* build list with only one notify */
-                if (!irc_notify_add_to_infolist (ptr_infolist, pointer))
-                {
-                    weechat_infolist_free (ptr_infolist);
-                    return NULL;
-                }
-                return ptr_infolist;
-            }
-            else
-            {
-                /* build list with notify list of all servers matching arguments */
-                for (ptr_server = irc_servers; ptr_server;
-                     ptr_server = ptr_server->next_server)
-                {
-                    if (!arguments || !arguments[0]
-                        || weechat_string_match (ptr_server->name, arguments, 0))
-                    {
-                        for (ptr_notify = ptr_server->notify_list; ptr_notify;
-                             ptr_notify = ptr_notify->next_notify)
-                        {
-                            if (!irc_notify_add_to_infolist (ptr_infolist,
-                                                             ptr_notify))
-                            {
-                                weechat_infolist_free (ptr_infolist);
-                                return NULL;
-                            }
-                        }
-                    }
-                }
-                return ptr_infolist;
+                weechat_infolist_free (ptr_infolist);
+                return NULL;
             }
         }
+        return ptr_infolist;
     }
-    else if (weechat_strcasecmp (infolist_name, "irc_color_weechat") == 0)
+
+    return NULL;
+}
+
+/*
+ * Returns IRC infolist "irc_notify".
+ */
+
+struct t_infolist *
+irc_info_infolist_irc_notify_cb (void *data, const char *infolist_name,
+                                 void *pointer, const char *arguments)
+{
+    struct t_infolist *ptr_infolist;
+    struct t_irc_server *ptr_server;
+    struct t_irc_notify *ptr_notify;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) infolist_name;
+
+    if (pointer && !irc_notify_valid (NULL, pointer))
+        return NULL;
+
+    ptr_infolist = weechat_infolist_new ();
+    if (!ptr_infolist)
+        return NULL;
+
+    if (pointer)
     {
-        ptr_infolist = weechat_infolist_new ();
-        if (ptr_infolist)
+        /* build list with only one notify */
+        if (!irc_notify_add_to_infolist (ptr_infolist, pointer))
         {
-            /* build list with all IRC colors */
-            if (!irc_color_weechat_add_to_infolist (ptr_infolist))
+            weechat_infolist_free (ptr_infolist);
+            return NULL;
+        }
+        return ptr_infolist;
+    }
+    else
+    {
+        /* build list with notify list of all servers matching arguments */
+        for (ptr_server = irc_servers; ptr_server;
+             ptr_server = ptr_server->next_server)
+        {
+            if (!arguments || !arguments[0]
+                || weechat_string_match (ptr_server->name, arguments, 0))
             {
-                weechat_infolist_free (ptr_infolist);
-                return NULL;
+                for (ptr_notify = ptr_server->notify_list; ptr_notify;
+                     ptr_notify = ptr_notify->next_notify)
+                {
+                    if (!irc_notify_add_to_infolist (ptr_infolist,
+                                                     ptr_notify))
+                    {
+                        weechat_infolist_free (ptr_infolist);
+                        return NULL;
+                    }
+                }
             }
-            return ptr_infolist;
         }
+        return ptr_infolist;
     }
 
     return NULL;
 }
 
 /*
+ * Returns IRC infolist "irc_color_weechat".
+ */
+
+struct t_infolist *
+irc_info_infolist_irc_color_weechat_cb (void *data, const char *infolist_name,
+                                        void *pointer, const char *arguments)
+{
+    struct t_infolist *ptr_infolist;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) infolist_name;
+    (void) pointer;
+    (void) arguments;
+
+    ptr_infolist = weechat_infolist_new ();
+    if (!ptr_infolist)
+        return NULL;
+
+    /* build list with all IRC colors */
+    if (!irc_color_weechat_add_to_infolist (ptr_infolist))
+    {
+        weechat_infolist_free (ptr_infolist);
+        return NULL;
+    }
+    return ptr_infolist;
+}
+
+/*
  * Hooks info, infolist and hdata for IRC plugin.
  */
 
@@ -590,42 +792,51 @@ void
 irc_info_init ()
 {
     /* info hooks */
-    weechat_hook_info ("irc_is_channel",
-                       N_("1 if string is a valid IRC channel name for server"),
-                       N_("server,channel (server is optional)"),
-                       &irc_info_get_info_cb, NULL);
-    weechat_hook_info ("irc_is_nick",
-                       N_("1 if string is a valid IRC nick name"),
-                       N_("nickname"),
-                       &irc_info_get_info_cb, NULL);
-    weechat_hook_info ("irc_nick",
-                       N_("get current nick on a server"),
-                       N_("server name"),
-                       &irc_info_get_info_cb, NULL);
-    weechat_hook_info ("irc_nick_from_host",
-                       N_("get nick from IRC host"),
-                       N_("IRC host (like `:nick!name@server.com`)"),
-                       &irc_info_get_info_cb, NULL);
-    weechat_hook_info ("irc_nick_color",
-                       N_("get nick color code"),
-                       N_("nickname"),
-                       &irc_info_get_info_cb, NULL);
-    weechat_hook_info ("irc_nick_color_name",
-                       N_("get nick color name"),
-                       N_("nickname"),
-                       &irc_info_get_info_cb, NULL);
-    weechat_hook_info ("irc_buffer",
-                       N_("get buffer pointer for an IRC server/channel/nick"),
-                       N_("server,channel,nick (channel and nicks are optional)"),
-                       &irc_info_get_info_cb, NULL);
-    weechat_hook_info ("irc_server_isupport",
-                       N_("1 if server supports this feature (from IRC message 005)"),
-                       N_("server,feature"),
-                       &irc_info_get_info_cb, NULL);
-    weechat_hook_info ("irc_server_isupport_value",
-                       N_("value of feature, if supported by server (from IRC message 005)"),
-                       N_("server,feature"),
-                       &irc_info_get_info_cb, NULL);
+    weechat_hook_info (
+        "irc_is_channel",
+        N_("1 if string is a valid IRC channel name for server"),
+        N_("server,channel (server is optional)"),
+        &irc_info_info_irc_is_channel_cb, NULL);
+    weechat_hook_info (
+        "irc_is_nick",
+        N_("1 if string is a valid IRC nick name"),
+        N_("nickname"),
+        &irc_info_info_irc_is_nick_cb, NULL);
+    weechat_hook_info (
+        "irc_nick",
+        N_("get current nick on a server"),
+        N_("server name"),
+        &irc_info_info_irc_nick_cb, NULL);
+    weechat_hook_info (
+        "irc_nick_from_host",
+        N_("get nick from IRC host"),
+        N_("IRC host (like `:nick!name@server.com`)"),
+        &irc_info_info_irc_nick_from_host_cb, NULL);
+    weechat_hook_info (
+        "irc_nick_color",
+        N_("get nick color code"),
+        N_("nickname"),
+        &irc_info_info_irc_nick_color_cb, NULL);
+    weechat_hook_info (
+        "irc_nick_color_name",
+        N_("get nick color name"),
+        N_("nickname"),
+        &irc_info_info_irc_nick_color_name_cb, NULL);
+    weechat_hook_info (
+        "irc_buffer",
+        N_("get buffer pointer for an IRC server/channel/nick"),
+        N_("server,channel,nick (channel and nicks are optional)"),
+        &irc_info_info_irc_buffer_cb, NULL);
+    weechat_hook_info (
+        "irc_server_isupport",
+        N_("1 if server supports this feature (from IRC message 005)"),
+        N_("server,feature"),
+        &irc_info_info_irc_server_isupport_cb, NULL);
+    weechat_hook_info (
+        "irc_server_isupport_value",
+        N_("value of feature, if supported by server (from IRC message 005)"),
+        N_("server,feature"),
+        &irc_info_info_irc_server_isupport_value_cb, NULL);
 
     /* info_hashtable hooks */
     weechat_hook_info_hashtable (
@@ -636,7 +847,7 @@ irc_info_init ()
         N_("\"tags\": tags, \"message_without_tags\": message without the "
            "tags, \"nick\": nick, \"host\": host, \"command\": command, "
            "\"channel\": channel, \"arguments\": arguments (includes channel)"),
-        &irc_info_get_info_hashtable_cb, NULL);
+        &irc_info_info_hashtable_irc_message_parse_cb, NULL);
     weechat_hook_info_hashtable (
         "irc_message_split",
         N_("split an IRC message (to fit in 512 bytes)"),
@@ -645,55 +856,69 @@ irc_info_init ()
         N_("\"msg1\" ... \"msgN\": messages to send (without final \"\\r\\n\"), "
            "\"args1\" ... \"argsN\": arguments of messages, \"count\": number "
            "of messages"),
-        &irc_info_get_info_hashtable_cb, NULL);
+        &irc_info_info_hashtable_irc_message_split_cb, NULL);
 
     /* infolist hooks */
-    weechat_hook_infolist ("irc_server",
-                           N_("list of IRC servers"),
-                           N_("server pointer (optional)"),
-                           N_("server name (wildcard \"*\" is allowed) (optional)"),
-                           &irc_info_get_infolist_cb, NULL);
-    weechat_hook_infolist ("irc_channel",
-                           N_("list of channels for an IRC server"),
-                           N_("channel pointer (optional)"),
-                           N_("server,channel (channel is optional)"),
-                           &irc_info_get_infolist_cb, NULL);
-    weechat_hook_infolist ("irc_nick",
-                           N_("list of nicks for an IRC channel"),
-                           N_("nick pointer (optional)"),
-                           N_("server,channel,nick (nick is optional)"),
-                           &irc_info_get_infolist_cb, NULL);
-    weechat_hook_infolist ("irc_ignore",
-                           N_("list of IRC ignores"),
-                           N_("ignore pointer (optional)"),
-                           NULL,
-                           &irc_info_get_infolist_cb, NULL);
-    weechat_hook_infolist ("irc_notify",
-                           N_("list of notify"),
-                           N_("notify pointer (optional)"),
-                           N_("server name (wildcard \"*\" is allowed) (optional)"),
-                           &irc_info_get_infolist_cb, NULL);
-    weechat_hook_infolist ("irc_color_weechat",
-                           N_("mapping between IRC color codes and WeeChat color names"),
-                           NULL,
-                           NULL,
-                           &irc_info_get_infolist_cb, NULL);
+    weechat_hook_infolist (
+        "irc_server",
+        N_("list of IRC servers"),
+        N_("server pointer (optional)"),
+        N_("server name (wildcard \"*\" is allowed) (optional)"),
+        &irc_info_infolist_irc_server_cb, NULL);
+    weechat_hook_infolist (
+        "irc_channel",
+        N_("list of channels for an IRC server"),
+        N_("channel pointer (optional)"),
+        N_("server,channel (channel is optional)"),
+        &irc_info_infolist_irc_channel_cb, NULL);
+    weechat_hook_infolist (
+        "irc_nick",
+        N_("list of nicks for an IRC channel"),
+        N_("nick pointer (optional)"),
+        N_("server,channel,nick (nick is optional)"),
+        &irc_info_infolist_irc_nick_cb, NULL);
+    weechat_hook_infolist (
+        "irc_ignore",
+        N_("list of IRC ignores"),
+        N_("ignore pointer (optional)"),
+        NULL,
+        &irc_info_infolist_irc_ignore_cb, NULL);
+    weechat_hook_infolist (
+        "irc_notify",
+        N_("list of notify"),
+        N_("notify pointer (optional)"),
+        N_("server name (wildcard \"*\" is allowed) (optional)"),
+        &irc_info_infolist_irc_notify_cb, NULL);
+    weechat_hook_infolist (
+        "irc_color_weechat",
+        N_("mapping between IRC color codes and WeeChat color names"),
+        NULL,
+        NULL,
+        &irc_info_infolist_irc_color_weechat_cb, NULL);
 
     /* hdata hooks */
-    weechat_hook_hdata ("irc_nick", N_("irc nick"),
-                        &irc_nick_hdata_nick_cb, NULL);
-    weechat_hook_hdata ("irc_channel", N_("irc channel"),
-                        &irc_channel_hdata_channel_cb, NULL);
-    weechat_hook_hdata ("irc_channel_speaking", N_("irc channel_speaking"),
-                        &irc_channel_hdata_channel_speaking_cb, NULL);
-    weechat_hook_hdata ("irc_ignore", N_("irc ignore"),
-                        &irc_ignore_hdata_ignore_cb, NULL);
-    weechat_hook_hdata ("irc_notify", N_("irc notify"),
-                        &irc_notify_hdata_notify_cb, NULL);
-    weechat_hook_hdata ("irc_redirect_pattern", N_("pattern for irc redirect"),
-                        &irc_redirect_hdata_redirect_pattern_cb, NULL);
-    weechat_hook_hdata ("irc_redirect", N_("irc redirect"),
-                        &irc_redirect_hdata_redirect_cb, NULL);
-    weechat_hook_hdata ("irc_server", N_("irc server"),
-                        &irc_server_hdata_server_cb, NULL);
+    weechat_hook_hdata (
+        "irc_nick", N_("irc nick"),
+        &irc_nick_hdata_nick_cb, NULL);
+    weechat_hook_hdata (
+        "irc_channel", N_("irc channel"),
+        &irc_channel_hdata_channel_cb, NULL);
+    weechat_hook_hdata (
+        "irc_channel_speaking", N_("irc channel_speaking"),
+        &irc_channel_hdata_channel_speaking_cb, NULL);
+    weechat_hook_hdata (
+        "irc_ignore", N_("irc ignore"),
+        &irc_ignore_hdata_ignore_cb, NULL);
+    weechat_hook_hdata (
+        "irc_notify", N_("irc notify"),
+        &irc_notify_hdata_notify_cb, NULL);
+    weechat_hook_hdata (
+        "irc_redirect_pattern", N_("pattern for irc redirect"),
+        &irc_redirect_hdata_redirect_pattern_cb, NULL);
+    weechat_hook_hdata (
+        "irc_redirect", N_("irc redirect"),
+        &irc_redirect_hdata_redirect_cb, NULL);
+    weechat_hook_hdata (
+        "irc_server", N_("irc server"),
+        &irc_server_hdata_server_cb, NULL);
 }