use an Enum for the cm_fields vector instead of nameless chars

[citadel.git] / citadel / modules / imap / imap_misc.c

diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index d62f487fa635ecb993f31f7ff553d355b20ab419..ede4b2fd726a50e038f871b1e99996977a9609b3 100644 (file)
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1987-2010 by the citadel.org team
+ * Copyright (c) 1987-2011 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
@@ -280,8 +280,8 @@ void imap_do_append_flags(long new_msgnum, char *new_message_flags) {
  * This function is called by the main command loop.
  */
 void imap_append(int num_parms, ConstStr *Params) {
+       struct CitContext *CCC = CC;
        long literal_length;
-       long bytes_transferred;
        struct CtdlMessage *msg = NULL;
        long new_msgnum = (-1L);
        int ret = 0;
@@ -340,7 +340,6 @@ void imap_append(int num_parms, ConstStr *Params) {
        
        IUnbuffer ();
 
-       bytes_transferred = 0;
        client_read_blob(Imap->TransmittedMessage, literal_length, config.c_sleeping);
 
        if ((ret < 0) || (StrLength(Imap->TransmittedMessage) < literal_length)) {
@@ -355,10 +354,10 @@ void imap_append(int num_parms, ConstStr *Params) {
        client_getln(dummy, sizeof dummy);
 
        /* Convert RFC822 newlines (CRLF) to Unix newlines (LF) */
-       CtdlLogPrintf(CTDL_DEBUG, "Converting CRLF to LF\n");
+       IMAPM_syslog(LOG_DEBUG, "Converting CRLF to LF");
        StrBufToUnixLF(Imap->TransmittedMessage);
 
-       CtdlLogPrintf(CTDL_DEBUG, "Converting message format\n");
+       IMAPM_syslog(LOG_DEBUG, "Converting message format");
        msg = convert_internet_message_buf(&Imap->TransmittedMessage);
 
        ret = imap_grabroom(roomname, Params[2].Key, 1);
@@ -385,12 +384,12 @@ void imap_append(int num_parms, ConstStr *Params) {
         */
        if (CC->logged_in) {
           if ( ((CC->room.QRflags & QR_MAILBOX) == 0) && (config.c_imap_keep_from == 0)) {
-               if (msg->cm_fields['A'] != NULL) free(msg->cm_fields['A']);
-               if (msg->cm_fields['N'] != NULL) free(msg->cm_fields['N']);
-               if (msg->cm_fields['H'] != NULL) free(msg->cm_fields['H']);
-               msg->cm_fields['A'] = strdup(CC->user.fullname);
-               msg->cm_fields['N'] = strdup(config.c_nodename);
-               msg->cm_fields['H'] = strdup(config.c_humannode);
+               if (msg->cm_fields[eAuthor] != NULL) free(msg->cm_fields[eAuthor]);
+               if (msg->cm_fields[eNodeName] != NULL) free(msg->cm_fields[eNodeName]);
+               if (msg->cm_fields[eHumanNode] != NULL) free(msg->cm_fields[eHumanNode]);
+               msg->cm_fields[eAuthor] = strdup(CC->user.fullname);
+               msg->cm_fields[eNodeName] = strdup(config.c_nodename);
+               msg->cm_fields[eHumanNode] = strdup(config.c_humannode);
            }
        }