Fix warnings all over citserver; handle function replies; remove unused code.

[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 500c2dc6a39876f049fc070f0d606c7b91038c4c..3ccd463671ac8b20d26d7a055ef60196301bdeb6 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.
@@ -212,7 +212,7 @@ void imap_copy(int num_parms, ConstStr *Params) {
                IAPuts("COPY completed\r\n");
        }
        else {
-               IReplyPrintf("NO COPY failed (error %d)\r\n", ret);
+               IReplyPrintf("NO COPY failed (error %d)", ret);
        }
 }
 
@@ -281,7 +281,6 @@ void imap_do_append_flags(long new_msgnum, char *new_message_flags) {
  */
 void imap_append(int num_parms, ConstStr *Params) {
        long literal_length;
-       long bytes_transferred;
        struct CtdlMessage *msg = NULL;
        long new_msgnum = (-1L);
        int ret = 0;
@@ -340,7 +339,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 +353,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");
+       syslog(LOG_DEBUG, "Converting CRLF to LF");
        StrBufToUnixLF(Imap->TransmittedMessage);
 
-       CtdlLogPrintf(CTDL_DEBUG, "Converting message format\n");
+       syslog(LOG_DEBUG, "Converting message format");
        msg = convert_internet_message_buf(&Imap->TransmittedMessage);
 
        ret = imap_grabroom(roomname, Params[2].Key, 1);
@@ -414,7 +412,7 @@ void imap_append(int num_parms, ConstStr *Params) {
                                     GLOBAL_UIDVALIDITY_VALUE, new_msgnum);
                }
                else {
-                       IReplyPrintf("BAD Error %ld saving message to disk.\r\n",
+                       IReplyPrintf("BAD Error %ld saving message to disk.",
                                     new_msgnum);
                }
        }