* --pedantic cleanup.

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 90202273e07592b8d60dece96cb82675cee413af..abf6b55e4d834d863da3c94fbb8b84cd699d85ab 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -63,7 +63,11 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e
 
 void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer)
 {
-       Put(MimeRenderHandler, HeaderName, HdrNLen, MimeRenderer, reference_free_handler);
+       RenderMimeFuncStruct *f;
+
+       f = (RenderMimeFuncStruct*) malloc(sizeof(RenderMimeFuncStruct));
+       f->f = MimeRenderer;
+       Put(MimeRenderHandler, HeaderName, HdrNLen, f, NULL);
        
 }
 
@@ -182,7 +186,7 @@ void examine_suff(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {
 void examine_path(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;}
 void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
-////TODO: do we care?
+/* TODO: do we care? */
 }
 
 void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
@@ -225,7 +229,8 @@ void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
        StrBuf_RFC822_to_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset);
 }
 void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{/////TODO: Fwd: and RE: filter!!
+{/*////TODO: Fwd: and RE: filter!!*/
+
        message_summary *Msg = (message_summary*) Context;
        StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->subj, 0);
 }
@@ -498,7 +503,7 @@ void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime)
            GetHash(MimeRenderHandler, SKEY(Mime->ContentType), &vMimeRenderer) &&
            vMimeRenderer != NULL)
        {
-               Mime->Renderer = (RenderMimeFunc) vMimeRenderer;
+               Mime->Renderer = (RenderMimeFuncStruct*) vMimeRenderer;
                if (Msg->Submessages == NULL)
                        Msg->Submessages = NewHash(1,NULL);
                Put(Msg->Submessages, SKEY(Mime->PartNum), Mime, reference_free_handler);
@@ -902,9 +907,9 @@ void tmplput_MIME_Data(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void
 {
        wc_mime_attachment *mime = (wc_mime_attachment*) Context;
        if (mime->Renderer != NULL)
-               mime->Renderer(mime, NULL, NULL);
+               mime->Renderer->f(mime, NULL, NULL);
        StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Data, 0);
- /// TODO: check whether we need to load it now?
+       /* TODO: check whether we need to load it now? */
 }
 
 void tmplput_MIME_LoadData(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)