dlink -> rb_dlink

[irc/rqf/shadowircd.git] / src / supported.c

diff --git a/src/supported.c b/src/supported.c
index fe90d7976a9903e4e8816397c0beba4916d7bde9..9dd8395c91c41e9e8526329ed3305e384e876f47 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -87,19 +87,20 @@
 #include "numeric.h"
 #include "ircd.h"
 #include "s_conf.h"
+#include "supported.h"
 
-dlink_list isupportlist;
+rb_dlink_list isupportlist;
 
 struct isupportitem
 {
        const char *name;
-       const char *(*func)(void *);
-       void *param;
-       dlink_node node;
+       const char *(*func)(const void *);
+       const void *param;
+       rb_dlink_node node;
 };
 
 void
-add_isupport(const char *name, const char *(*func)(void *), void *param)
+add_isupport(const char *name, const char *(*func)(const void *), const void *param)
 {
        struct isupportitem *item;
 
@@ -107,13 +108,13 @@ add_isupport(const char *name, const char *(*func)(void *), void *param)
        item->name = name;
        item->func = func;
        item->param = param;
-       dlinkAddTail(item, &item->node, &isupportlist);
+       rb_dlinkAddTail(item, &item->node, &isupportlist);
 }
 
 void
 delete_isupport(const char *name)
 {
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
        struct isupportitem *item;
 
        DLINK_FOREACH_SAFE(ptr, next_ptr, isupportlist.head)
@@ -122,7 +123,7 @@ delete_isupport(const char *name)
 
                if (!strcmp(item->name, name))
                {
-                       dlinkDelete(ptr, &isupportlist);
+                       rb_dlinkDelete(ptr, &isupportlist);
                        MyFree(item);
                }
        }
@@ -132,12 +133,12 @@ delete_isupport(const char *name)
 void
 show_isupport(struct Client *client_p)
 {
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        struct isupportitem *item;
        const char *value;
        char buf[512];
        int extra_space;
-       int nchars, nparams;
+       unsigned int nchars, nparams;
        int l;
 
        extra_space = strlen(client_p->name);
@@ -177,83 +178,81 @@ show_isupport(struct Client *client_p)
 }
 
 const char *
-isupport_intptr(void *ptr)
+isupport_intptr(const void *ptr)
 {
        static char buf[15];
-
-       ircsnprintf(buf, sizeof buf, "%d", *(int *)ptr);
+       rb_snprintf(buf, sizeof buf, "%d", *(const int *)ptr);
        return buf;
 }
 
 const char *
-isupport_boolean(void *ptr)
+isupport_boolean(const void *ptr)
 {
 
-       return *(int *)ptr ? "" : NULL;
+       return *(const int *)ptr ? "" : NULL;
 }
 
 const char *
-isupport_string(void *ptr)
+isupport_string(const void *ptr)
 {
 
        return (const char *)ptr;
 }
 
 const char *
-isupport_stringptr(void *ptr)
+isupport_stringptr(const void *ptr)
 {
-
-       return *(const char **)ptr;
+       return *(char * const *)ptr;    
 }
 
-const char *
-isupport_chanmodes(void *ptr)
+static const char *
+isupport_chanmodes(const void *ptr)
 {
        static char result[80];
 
-       ircsnprintf(result, sizeof result, "%s%sbq,k,%slj,imnpst%scgzLP%s",
+       rb_snprintf(result, sizeof result, "%s%sbq,k,%slj,imnpst%scgzLP%s",
                        ConfigChannel.use_except ? "e" : "",
                        ConfigChannel.use_invex ? "I" : "",
                        ConfigChannel.use_forward ? "f" : "",
-                       dlink_list_length(&service_list) ? "r" : "",
+                       rb_dlink_list_length(&service_list) ? "r" : "",
                        ConfigChannel.use_forward ? "QF" : "");
        return result;
 }
 
-const char *
-isupport_chanlimit(void *ptr)
+static const char *
+isupport_chanlimit(const void *ptr)
 {
        static char result[30];
 
-       ircsnprintf(result, sizeof result, "&#:%i", ConfigChannel.max_chans_per_user);
+       rb_snprintf(result, sizeof result, "&#:%i", ConfigChannel.max_chans_per_user);
        return result;
 }
 
-const char *
-isupport_maxlist(void *ptr)
+static const char *
+isupport_maxlist(const void *ptr)
 {
        static char result[30];
 
-       ircsnprintf(result, sizeof result, "bq%s%s:%i",
+       rb_snprintf(result, sizeof result, "bq%s%s:%i",
                        ConfigChannel.use_except ? "e" : "",
                        ConfigChannel.use_invex ? "I" : "",
                        ConfigChannel.max_bans);
        return result;
 }
 
-const char *
-isupport_targmax(void *ptr)
+static const char *
+isupport_targmax(const void *ptr)
 {
        static char result[200];
 
-       ircsnprintf(result, sizeof result, "NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:%d,NOTICE:%d,ACCEPT:,MONITOR:",
+       rb_snprintf(result, sizeof result, "NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:%d,NOTICE:%d,ACCEPT:,MONITOR:",
                        ConfigFileEntry.max_targets,
                        ConfigFileEntry.max_targets);
        return result;
 }
 
-const char *
-isupport_extban(void *ptr)
+static const char *
+isupport_extban(const void *ptr)
 {
        const char *p;
        static char result[200];
@@ -261,7 +260,7 @@ isupport_extban(void *ptr)
        p = get_extban_string();
        if (EmptyString(p))
                return NULL;
-       ircsnprintf(result, sizeof result, "$,%s", p);
+       rb_snprintf(result, sizeof result, "$,%s", p);
        return result;
 }