Removed Msg->reply_to because it held data for an older version of the code, we no...

diff --git a/webcit/messages.c b/webcit/messages.c
index 94968338888761f68e8033e224acd73fa5e1b687..6d83128d2107041ac388cf19d9e3c0ec4e2a9b48 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -46,7 +46,6 @@ int load_message(message_summary *Msg,
                 StrBuf *FoundCharset,
                 StrBuf **Error)
 {
-       wcsession *WCC = WC;
        StrBuf *Buf;
        StrBuf *HdrToken;
        headereval *Hdr;
@@ -161,38 +160,6 @@ int load_message(message_summary *Msg,
        /* now we put the body mimepart we read above into the mimelist */
        Put(Msg->AllAttach, SKEY(Msg->MsgBody->PartNum), Msg->MsgBody, DestroyMime);
        
-       /* Generate a reply-to address */
-       if (StrLength(Msg->Rfca) > 0) {
-               if (Msg->reply_to == NULL)
-                       Msg->reply_to = NewStrBuf();
-               if (StrLength(Msg->from) > 0) {
-                       StrBufPrintf(Msg->reply_to, "%s <%s>", ChrPtr(Msg->from), ChrPtr(Msg->Rfca));
-               }
-               else {
-                       FlushStrBuf(Msg->reply_to);
-                       StrBufAppendBuf(Msg->reply_to, Msg->Rfca, 0);
-               }
-       }
-       else 
-       {
-               if ((StrLength(Msg->OtherNode)>0) && 
-                   (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_nodename))) &&
-                   (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_humannode)) ))
-               {
-                       if (Msg->reply_to == NULL)
-                               Msg->reply_to = NewStrBuf();
-                       StrBufPrintf(Msg->reply_to, 
-                                    "%s @ %s",
-                                    ChrPtr(Msg->from), 
-                                    ChrPtr(Msg->OtherNode));
-               }
-               else {
-                       if (Msg->reply_to == NULL)
-                               Msg->reply_to = NewStrBuf();
-                       FlushStrBuf(Msg->reply_to);
-                       StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
-               }
-       }
        FreeStrBuf(&Buf);
        FreeStrBuf(&HdrToken);
        return 1;

diff --git a/webcit/messages.h b/webcit/messages.h
index 62d290cbe0df62a56c1a2ebc2c511e20fa3432c0..d7eefbda63e415ede2bc8b1b6387b1cbc3a89c7b 100644 (file)
--- a/webcit/messages.h
+++ b/webcit/messages.h
@@ -40,7 +40,6 @@ typedef struct _message_summary {
        StrBuf *subj;           /* the title / subject */
        StrBuf *reply_inreplyto;
        StrBuf *reply_references;
-       StrBuf *reply_to;
        StrBuf *cccc;
        StrBuf *hnod;
        StrBuf *AllRcpt;

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 74c34e5d69e7a98c5b11a860e6f12ea369c5535a..ed58d93d519be015747afa000ddb3b2d4869334a 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -51,9 +51,7 @@ void DestroyMessageSummary(void *vMsg)
        FreeStrBuf(&Msg->Rfca);
        FreeStrBuf(&Msg->OtherNode);
 
-       FreeStrBuf(&Msg->reply_to);
-
-       DeleteHash(&Msg->Attachments);  /**< list of Accachments */
+       DeleteHash(&Msg->Attachments);  /* list of Attachments */
        DeleteHash(&Msg->Submessages);
        DeleteHash(&Msg->AttachLinks);
        DeleteHash(&Msg->AllAttach);

diff --git a/webcit/sieve.c b/webcit/sieve.c
index 4c613709639e13d04f1e837fe5fef3a20c1961da..8506e1fd9f0be6a2bbb479d1527d28801f592e7a 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -1276,7 +1276,7 @@ HashList *GetSieveScriptListing(StrBuf *Target, WCTemplputParams *TP)
 
        if (num_scripts > have_rules_script)
        {
-               long rc;
+               long rc = 0;
                long len;
                const char *Key;
                void *vRuleset;

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 8d3c6a885d442b736a56a202d267f5989ace6541..b6953755e439475f101bc4fb836c75a505bb854f 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -275,8 +275,11 @@ void FlushReadBuf (void)
                pche = pch + len;
                if (WCC->ReadPos != pche)
                {
-                       syslog(1, "ERROR: somebody didn't eat his soup! Remaing Chars: %ld [%s]\n", 
-                               pche - WCC->ReadPos, pche);
+                       syslog(1,
+                               "ERROR: somebody didn't eat his soup! Remaing Chars: %ld [%s]\n", 
+                               (long)(pche - WCC->ReadPos),
+                               pche
+                       );
                        syslog(1, 
                                "--------------------------------------------------------------------------------\n"
                                "Whole buf: [%s]\n"