Branch merge

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

diff --git a/modules/m_list.c b/modules/m_list.c
index f3581a5adb7d6acd879326fdf54b7b728f05e599..e6aaff4ebbd31c167206cfaf153eaf076e45df38 100644 (file)
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -124,14 +124,14 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co
        if (parc < 2 || !IsChannelName(parv[1]))
        {
                /* pace this due to the sheer traffic involved */
-               if (((last_used + ConfigFileEntry.pace_wait) > CurrentTime))
+               if (((last_used + ConfigFileEntry.pace_wait) > rb_current_time()))
                {
                        sendto_one(source_p, form_str(RPL_LOAD2HI), me.name, source_p->name, "LIST");
                        sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
                        return 0;
                }
                else
-                       last_used = CurrentTime;
+                       last_used = rb_current_time();
        }
 
        return mo_list(client_p, source_p, parc, parv);
@@ -249,7 +249,7 @@ static void safelist_client_instantiate(struct Client *client_p, struct ListClie
        s_assert(MyClient(client_p));
        s_assert(params != NULL);
 
-       self = MyMalloc(sizeof(struct ListClient));
+       self = rb_malloc(sizeof(struct ListClient));
 
        self->hash_indice = 0;
        self->users_min = params->users_min;
@@ -283,7 +283,7 @@ static void safelist_client_release(struct Client *client_p)
 
        rb_dlinkFindDestroy(client_p, &safelisting_clients);
 
-       MyFree(client_p->localClient->safelist_data);
+       rb_free(client_p->localClient->safelist_data);
 
        client_p->localClient->safelist_data = NULL;