Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/src/substitution.c b/src/substitution.c
index d0bff4c29c020b1bf45dc5ad0641d569d740b802..5cef86b09a914eb262b04241e86cd8e14f46f15c 100644 (file)
--- a/src/substitution.c
+++ b/src/substitution.c
@@ -34,8 +34,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "balloc.h"
 #include "s_user.h"
 #include "irc_string.h"
 
@@ -53,50 +51,50 @@ struct substitution_variable
 /*
  * substitution_append_var
  *
- * Inputs       - A variable list (dlink_list), name -> value for mapping to make
+ * Inputs       - A variable list (rb_dlink_list), name -> value for mapping to make
  * Output       - none
  * Side Effects - Adds a name->value mapping to a list.
  */
-void substitution_append_var(dlink_list *varlist, const char *name, const char *value)
+void substitution_append_var(rb_dlink_list *varlist, const char *name, const char *value)
 {
        struct substitution_variable *tmp = MyMalloc(sizeof(struct substitution_variable));
 
        DupString(tmp->name, name);
        DupString(tmp->value, value);
 
-       dlinkAddAlloc(tmp, varlist);
+       rb_dlinkAddAlloc(tmp, varlist);
 }
 
 /*
  * substitution_free
  *
- * Inputs       - A dlink_list of markup variables to free.
+ * Inputs       - A rb_dlink_list of markup variables to free.
  * Outputs      - none
  * Side Effects - Empties a list of markup variables.
  */
-void substitution_free(dlink_list *varlist)
+void substitution_free(rb_dlink_list *varlist)
 {
-       dlink_node *nptr, *nptr2;
+       rb_dlink_node *nptr, *nptr2;
 
-       DLINK_FOREACH_SAFE(nptr, nptr2, varlist->head)
+       RB_DLINK_FOREACH_SAFE(nptr, nptr2, varlist->head)
        {
                struct substitution_variable *tmp = (struct substitution_variable *) nptr->data;
 
-               dlinkDelete(nptr, varlist);
-               MyFree(tmp->name);
-               MyFree(tmp->value);
-               MyFree(tmp);
+               rb_dlinkDelete(nptr, varlist);
+               rb_free(tmp->name);
+               rb_free(tmp->value);
+               rb_free(tmp);
        }
 }
 
 /*
  * substitution_parse
  *
- * Inputs       - A markup string, dlink-list of markup values
+ * Inputs       - A markup string, rb_dlink-list of markup values
  * Output       - A string which has been markup-replaced.
  * Side Effects - Strings larger than BUFSIZE are terminated.
  */
-char *substitution_parse(const char *fmt, dlink_list *varlist)
+char *substitution_parse(const char *fmt, rb_dlink_list *varlist)
 {
        static char buf[BUFSIZE];
        const char *ptr;
@@ -110,7 +108,7 @@ char *substitution_parse(const char *fmt, dlink_list *varlist)
                        static char varname[BUFSIZE];
                        char *vptr = varname;
                        const char *pptr;
-                       dlink_node *nptr;
+                       rb_dlink_node *nptr;
 
                        *vptr = '\0';
 
@@ -132,7 +130,7 @@ char *substitution_parse(const char *fmt, dlink_list *varlist)
                        /* advance ptr by length of variable */
                        ptr += (pptr - ptr);
 
-                       DLINK_FOREACH(nptr, varlist->head)
+                       RB_DLINK_FOREACH(nptr, varlist->head)
                        {
                                struct substitution_variable *val = (struct substitution_variable *) nptr->data;