DubString -> rb_strdup

[solanum.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index 4dc13cb6396dd1bbe4c6377195f0a2edc8ec969a..b1b347bb2a6f0e8730d91608dd1a1ecf073a2b6c 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -41,9 +40,6 @@
 #include "whowas.h"
 #include "s_conf.h"            /* ConfigFileEntry, ConfigChannel */
 #include "s_newconf.h"
-#include "event.h"
-#include "memory.h"
-#include "balloc.h"
 #include "s_log.h"
 
 extern rb_dlink_list global_channel_list;
@@ -93,14 +89,14 @@ allocate_channel(const char *chname)
 {
        struct Channel *chptr;
        chptr = BlockHeapAlloc(channel_heap);
-       DupString(chptr->chname, chname);
+       chptr->chname = rb_strdup(chname);
        return (chptr);
 }
 
 void
 free_channel(struct Channel *chptr)
 {
-       MyFree(chptr->chname);
+       rb_free(chptr->chname);
        BlockHeapFree(channel_heap, chptr);
 }
 
@@ -109,8 +105,8 @@ allocate_ban(const char *banstr, const char *who)
 {
        struct Ban *bptr;
        bptr = BlockHeapAlloc(ban_heap);
-       DupString(bptr->banstr, banstr);
-       DupString(bptr->who, who);
+       bptr->banstr = rb_strdup(banstr);
+       bptr->who = rb_strdup(who);
 
        return (bptr);
 }
@@ -118,8 +114,8 @@ allocate_ban(const char *banstr, const char *who)
 void
 free_ban(struct Ban *bptr)
 {
-       MyFree(bptr->banstr);
-       MyFree(bptr->who);
+       rb_free(bptr->banstr);
+       rb_free(bptr->who);
        BlockHeapFree(ban_heap, bptr);
 }