]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - src/substitution.c
MyFree -> rb_free
[irc/rqf/shadowircd.git] / src / substitution.c
index c899ff42e1985dc6cc6ae5bfdce8ddd2bd5cf530..28b9d315b43a535b7b06d872f11e6f82d9bf43de 100644 (file)
@@ -34,8 +34,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "balloc.h"
 #include "s_user.h"
 #include "irc_string.h"
 
@@ -78,7 +76,7 @@ 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;
 
@@ -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;