Remove s_assert definition from ircd_defs.h and add it to its own header.

[solanum.git] / src / substitution.c

diff --git a/src/substitution.c b/src/substitution.c
index 58deefabc30a2f9a4a5d60a13a356a3cb0236ba0..bb935510f567c78a3c55d3b72e0ed25fe9dd823c 100644 (file)
--- a/src/substitution.c
+++ b/src/substitution.c
@@ -35,7 +35,10 @@
 
 #include "stdinc.h"
 #include "s_user.h"
-#include "irc_string.h"
+#include "snomask.h"
+#include "match.h"
+#include "substitution.h"
+#include "s_assert.h"
 
 /*
  * Simple mappings for $foo -> 'bar'.
@@ -59,8 +62,8 @@ void substitution_append_var(rb_dlink_list *varlist, const char *name, const cha
 {
        struct substitution_variable *tmp = rb_malloc(sizeof(struct substitution_variable));
 
-       DupString(tmp->name, name);
-       DupString(tmp->value, value);
+       tmp->name = rb_strdup(name);
+       tmp->value = rb_strdup(value);
 
        rb_dlinkAddAlloc(tmp, varlist);
 }
@@ -136,7 +139,7 @@ char *substitution_parse(const char *fmt, rb_dlink_list *varlist)
 
                                if (!strcasecmp(varname, val->name))
                                {
-                                       strlcpy(bptr, val->value, BUFSIZE - (bptr - buf));
+                                       rb_strlcpy(bptr, val->value, BUFSIZE - (bptr - buf));
                                        bptr += strlen(val->value);
                                        break;
                                }