Revert 415a87c328d1 as the corresponding ConfItem change won't be done now.

[irc/rqf/shadowircd.git] / modules / m_resv.c

diff --git a/modules/m_resv.c b/modules/m_resv.c
index 84a0183dfb1db57c44678de21b6942a5a6dcaaa8..084f3f8ef0d6225132346ebebb11550b47acf0c8 100644 (file)
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -224,13 +224,13 @@ parse_resv(struct Client *source_p, const char *name,
                aconf = make_conf();
                aconf->status = CONF_RESV_CHANNEL;
                aconf->port = 0;
-               DupString(aconf->name, name);
-               DupString(aconf->passwd, reason);
+               aconf->name = rb_strdup(name);
+               aconf->passwd = rb_strdup(reason);
                add_to_resv_hash(aconf->name, aconf);
 
                if(temp_time > 0)
                {
-                       aconf->hold = CurrentTime + temp_time;
+                       aconf->hold = rb_current_time() + temp_time;
 
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "%s added temporary %d min. RESV for [%s] [%s]",
@@ -282,13 +282,13 @@ parse_resv(struct Client *source_p, const char *name,
                aconf = make_conf();
                aconf->status = CONF_RESV_NICK;
                aconf->port = 0;
-               DupString(aconf->name, name);
-               DupString(aconf->passwd, reason);
-               dlinkAddAlloc(aconf, &resv_conf_list);
+               aconf->name = rb_strdup(name);
+               aconf->passwd = rb_strdup(reason);
+               rb_dlinkAddAlloc(aconf, &resv_conf_list);
 
                if(temp_time > 0)
                {
-                       aconf->hold = CurrentTime + temp_time;
+                       aconf->hold = rb_current_time() + temp_time;
 
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "%s added temporary %d min. RESV for [%s] [%s]",
@@ -516,7 +516,7 @@ remove_resv(struct Client *source_p, const char *name)
                        ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
                }
                /* already have ptr from the loop above.. */
-               dlinkDestroy(ptr, &resv_conf_list);
+               rb_dlinkDestroy(ptr, &resv_conf_list);
        }
        free_conf(aconf);
 
@@ -544,7 +544,7 @@ remove_resv_from_file(struct Client *source_p, const char *name)
        int error_on_write = 0;
        int found_resv = 0;
 
-       ircsprintf(temppath, "%s.tmp", ConfigFileEntry.resvfile);
+       rb_sprintf(temppath, "%s.tmp", ConfigFileEntry.resvfile);
        filename = get_conf_name(RESV_TYPE);
 
        if((in = fopen(filename, "r")) == NULL)