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 c899ff42e1985dc6cc6ae5bfdce8ddd2bd5cf530..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"
 
@@ -78,14 +76,14 @@ void substitution_free(rb_dlink_list *varlist)
 {
        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;
 
                rb_dlinkDelete(nptr, varlist);
-               MyFree(tmp->name);
-               MyFree(tmp->value);
-               MyFree(tmp);
+               rb_free(tmp->name);
+               rb_free(tmp->value);
+               rb_free(tmp);
        }
 }
 
@@ -132,7 +130,7 @@ char *substitution_parse(const char *fmt, rb_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;