final touches on dkim test harness

[citadel.git] / webcit / calendar.c

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 1185bfc22d233dbb8bda5e3d94573a1443ad63b0..b1da61c4182a6706362e192c4ea24242c7a4a07d 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -11,7 +11,7 @@
 // GNU General Public License for more details.
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "calendar.h"
 
 // Process a calendar object.  At this point it's already been deserialized by cal_process_attachment()
@@ -175,7 +175,7 @@ void cal_process_object(StrBuf *Target,
 
                        // screen name or email address
                        safestrncpy(buf, ch + 7, sizeof(buf));
-                       striplt(buf);
+                       string_trim(buf);
                        StrEscAppend(Target, NULL, buf, 0, 0);
                        StrBufAppendPrintf(Target, " ");
 
@@ -518,9 +518,7 @@ void display_individual_cal(icalcomponent *event, long msgnum, char *from, int u
                        if (cptr) {
 
                                /* Remove any existing DTSTART properties */
-                               while ( ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY),
-                                       ps != NULL
-                               ) {
+                               while (ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY), ps != NULL) {
                                        icalcomponent_remove_property(cptr, ps);
                                }
 
@@ -668,7 +666,7 @@ void load_ical_object(long msgnum, int unread,
                                      || (!strcasecmp(mime_content_type, "application/ics"))
                                      || (!strcasecmp(mime_content_type, "text/vtodo"))
                                      || (!strcasecmp(mime_content_type, "text/todo"))
-                                       ) {
+                               ) {
                                        strcpy(relevant_partnum, mime_partnum);
                                }
                        }
@@ -683,11 +681,11 @@ void load_ical_object(long msgnum, int unread,
                        if (!IsEmptyStr(bptr)) {
                                if (!strncasecmp(bptr, "Content-type: ", 14)) {
                                        safestrncpy(msg4_content_type, &bptr[14], sizeof msg4_content_type);
-                                       striplt(msg4_content_type);
+                                       string_trim(msg4_content_type);
                                }
                                else if (!strncasecmp(bptr, "Content-transfer-encoding: ", 27)) {
                                        safestrncpy(msg4_content_encoding, &bptr[27], sizeof msg4_content_encoding);
-                                       striplt(msg4_content_type);
+                                       string_trim(msg4_content_type);
                                }
                                else if ((!strncasecmp(bptr, "Content-length: ", 16))) {
                                        msg4_content_length = atoi(&bptr[16]);