Replace all discrete checks for empty message fields by CM_IsEmpty()

[citadel.git] / citadel / modules / extnotify / extnotify_main.c

diff --git a/citadel/modules/extnotify/extnotify_main.c b/citadel/modules/extnotify/extnotify_main.c
index 6d865082ca7f30e0d5b9cf41958bf273834c4f28..3eced5a59967aaff2c5211dcb576936968e5ba4b 100644 (file)
--- a/citadel/modules/extnotify/extnotify_main.c
+++ b/citadel/modules/extnotify/extnotify_main.c
@@ -186,7 +186,7 @@ eNotifyType extNotify_getConfigMessage(char *username,
        for (a = 0; a < num_msgs; ++a) {
                msg = CtdlFetchMessage(msglist[a], 1);
                if (msg != NULL) {
-                       if ((msg->cm_fields[eMsgSubject] != NULL) &&
+                       if (!CM_IsEmpty(msg, eMsgSubject) &&
                            (strncasecmp(msg->cm_fields[eMsgSubject],
                                         PAGER_CONFIG_MESSAGE,
                                         strlen(PAGER_CONFIG_MESSAGE)) == 0))
@@ -280,7 +280,7 @@ void process_notify(long NotifyMsgnum, void *usrdata)
        Ctx = (NotifyContext*) usrdata;
 
        msg = CtdlFetchMessage(NotifyMsgnum, 1);
-       if ( msg->cm_fields[eExtnotify] != NULL)
+       if (!CM_IsEmpty(msg, eExtnotify))
        {
                Type = extNotify_getConfigMessage(
                        msg->cm_fields[eExtnotify],