* Replaced all occurances of malloc(), realloc(), and free() in the

[citadel.git] / citadel / serv_chat.c

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 1e8dd93e39abffadcf13267e9339a4daf17fc7fe..fcacf1fd5d40b4ceab5be7992e1a5afc3a8c7f83 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -87,7 +87,7 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
                fclose(fp);
                }
 
-       clnew = (struct ChatLine *) malloc(sizeof(struct ChatLine));
+       clnew = (struct ChatLine *) mallok(sizeof(struct ChatLine));
        memset(clnew, 0, sizeof(struct ChatLine));
        if (clnew == NULL) {
                fprintf(stderr, "citserver: cannot alloc chat line: %s\n",
@@ -130,7 +130,7 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
                if ( (now - ChatQueue->chat_time) < 120L ) goto DONE_FREEING;
                clptr = ChatQueue;
                ChatQueue = ChatQueue->next;
-               free(clptr);
+               phree(clptr);
                }
 DONE_FREEING:  end_critical_section(S_CHATQUEUE);
        }
@@ -378,7 +378,7 @@ void cmd_pexp(char *argbuf) /* arg unused */ {
                begin_critical_section(S_SESSION_TABLE);
                emptr = CC->FirstExpressMessage;
                CC->FirstExpressMessage = CC->FirstExpressMessage->next;
-               free(emptr);
+               phree(emptr);
                end_critical_section(S_SESSION_TABLE);
                }
        cprintf("000\n");
@@ -446,7 +446,7 @@ void cmd_sexp(char *argbuf)
                   || (!strcasecmp(x_user, "broadcast")) ) {
                        strcpy(ccptr->last_pager, CC->curr_user);
                        emnew = (struct ExpressMessage *)
-                               malloc(sizeof(struct ExpressMessage));
+                               mallok(sizeof(struct ExpressMessage));
                        emnew->next = NULL;
                        sprintf(emnew->em_text, "%s from %s:\n %s\n",
                                ( (!strcasecmp(x_user, "broadcast")) ? "Broadcast message" : "Message" ),