buybuy plaintext important message.

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index c732144e3c9093e08a9db565bae4a312ed991f88..1e1e222970f2b75e3bae7a0d40c7b4d1e00f2c37 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -561,36 +561,31 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, int full, wc_mim
        StrBuf *Swap = NULL;
        int i, j;
        char buf[SIZ];
-       char *name;
        int is_qp = 0;
        int is_b64 = 0;
        StrBuf *thisname = NULL;
-       char *thisvalue = NULL;
        char firsttoken[SIZ];
-       int pass;
-       long len;
        void *V;
 
        Swap = NewStrBuf ();
        thisname = NewStrBuf();
        for (i=0; i<(v->numprops); ++i) {
-               int len;
                is_qp = 0;
                is_b64 = 0;
                StrBufPlain(thisname, v->prop[i].name, -1);
                StrBufLowerCase(thisname);
                
-               len = extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
+               /*len = */extract_token(firsttoken, ChrPtr(thisname), 0, ';', sizeof firsttoken);
                
-               for (j=0; j<num_tokens(thisname, ';'); ++j) {
-                       extract_token(buf, thisname, j, ';', sizeof buf);
+               for (j=0; j<num_tokens(ChrPtr(thisname), ';'); ++j) {
+                       extract_token(buf, ChrPtr(thisname), j, ';', sizeof buf);
                        if (!strcasecmp(buf, "encoding=quoted-printable")) {
                                is_qp = 1;
-                               remove_token(thisname, j, ';');
+/*                             remove_token(thisname, j, ';');*/
                        }
                        if (!strcasecmp(buf, "encoding=base64")) {
                                is_b64 = 1;
-                               remove_token(thisname, j, ';');
+/*                             remove_token(thisname, j, ';');*/
                        }
                }
                
@@ -618,7 +613,7 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, int full, wc_mim
                {
                        eVC evc = (eVC) V;
                        Put(VC, IKEY(evc), Val, HFreeStrBuf);
-                       syslog(1, "[%ld]\n", evc);
+                       syslog(1, "[%ul]\n", evc);
                        Val = NULL;
                }
                else
@@ -1307,10 +1302,7 @@ void submit_vcard(void) {
        v = VCardLoad(Buf);     /* Start with the extra fields */
        FreeStrBuf(&Buf);
        if (v == NULL) {
-               safestrncpy(WCC->ImportantMessage,
-                       _("An error has occurred."),
-                       sizeof WCC->ImportantMessage
-               );
+               AppendImportantMessage(_("An error has occurred."), -1);
                edit_vcard();
                return;
        }
@@ -1353,10 +1345,7 @@ void submit_vcard(void) {
        serialized_vcard = vcard_serialize(v);
        vcard_free(v);
        if (serialized_vcard == NULL) {
-               safestrncpy(WCC->ImportantMessage,
-                       _("An error has occurred."),
-                       sizeof WCC->ImportantMessage
-               );
+               AppendImportantMessage(_("An error has occurred."), -1);
                edit_vcard();
                return;
        }