Reverts commit c6aec42f213ec284e34648f3d69bcf927dccddb1 because putting the opening...

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index d713aaea9a91df089caece3368b43ab49cd8b74d..d0ad4d67c9451f927af3835e41af3ba421def87c 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -181,7 +181,6 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
        Msg = (message_summary *)malloc(sizeof(message_summary));
        if (!Msg) {
                syslog(LOG_DEBUG, "malloc() error");
-               TRACE;
        }
        memset(Msg, 0, sizeof(message_summary));
        Msg->msgnum = msgnum;
@@ -189,7 +188,6 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
        Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
        if (!Msg->MsgBody) {
                syslog(LOG_DEBUG, "malloc() error");
-               TRACE;
        }
        memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
        Msg->MsgBody->msgnum = msgnum;
@@ -544,7 +542,6 @@ int load_msg_ptrs(const char *servcmd,
                        Msg = (message_summary*)malloc(sizeof(message_summary));
                        if (!Msg) {
                                syslog(LOG_DEBUG, "malloc() error");
-                               TRACE;
                        }
                        memset(Msg, 0, sizeof(message_summary));
 
@@ -948,7 +945,7 @@ void post_mime_to_server(void) {
                                break;
                        }
                        syslog(LOG_DEBUG, "Attachment: raw len %d", StrLength(att->Data));
-                       encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), 1);
+                       encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), BASE64_YES_LINEBREAKS);
                        syslog(LOG_DEBUG, "Attachment: encoded len %d", encoded_strlen);
 
                        serv_printf("--%s", top_boundary);
@@ -961,14 +958,10 @@ void post_mime_to_server(void) {
                        serv_puts("");
                        free(encoded);
                }
-               syslog(LOG_DEBUG, "\033[33m sending final boundary --%s-- \033[0m", top_boundary);
-               TRACE;
                serv_printf("--%s--", top_boundary);
                DeleteHashPos(&it);
        }
 
-       syslog(LOG_DEBUG, "\033[33m sending terminating 000 \033[0m");
-       TRACE;
        serv_puts("000");
 }
 
@@ -1233,7 +1226,6 @@ void upload_attachment(void) {
        att = (wc_mime_attachment*)malloc(sizeof(wc_mime_attachment));
        if (!att) {
                syslog(LOG_DEBUG, "malloc() error");
-               TRACE;
        }
        memset(att, 0, sizeof(wc_mime_attachment ));
        att->length = WC->upload_length;
@@ -1799,14 +1791,13 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download) {
 }
 
 
-/*
- * Generic function to output an arbitrary MIME part from an arbitrary
- * message number on the server.
- *
- * msgnum              message number on the citadel server
- * partnum             MIME part number to be output
- * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
- */
+// Generic function to output an arbitrary MIME part from an arbitrary
+// message number on the server.
+//
+// msgnum              message number on the citadel server
+// partnum             MIME part number to be output
+// force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
+
 void view_or_download_mimepart(int force_download) {
        long msgnum;
        off_t bytes;