refactor naming of core message manipulation funcions

[citadel.git] / citadel / modules / network / serv_network.c

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index b2b296ef8bae2510ac99513535abe49b8943ccfb..c0baa5f9a342f33955936dbd55bf831016262a0f 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -111,7 +111,7 @@ int network_usetable(struct CtdlMessage *msg)
        time_t now;
 
        /* Bail out if we can't generate a message ID */
-       if ((msg == NULL) || (msg->cm_fields[emessageId] == NULL) || (IsEmptyStr(msg->cm_fields[emessageId])))
+       if ((msg == NULL) || CM_IsEmpty(msg, emessageId))
        {
                return(0);
        }
@@ -120,7 +120,7 @@ int network_usetable(struct CtdlMessage *msg)
        msgid = NewStrBufPlain(msg->cm_fields[emessageId], -1);
        if (haschar(ChrPtr(msgid), '@') == 0) {
                StrBufAppendBufPlain(msgid, HKEY("@"), 0);
-               if (msg->cm_fields[eNodeName] != NULL) {
+               if (!CM_IsEmpty(msg, eNodeName)) {
                        StrBufAppendBufPlain(msgid, msg->cm_fields[eNodeName], -1, 0);
                }
                else {
@@ -416,7 +416,7 @@ void network_bounce(struct CtdlMessage *msg, char *reason)
 
        /* Clean up */
        if (valid != NULL) free_recipients(valid);
-       CtdlFreeMessage(msg);
+       CM_Free(msg);
        QNM_syslog(LOG_DEBUG, "leaving network_bounce()\n");
 }