* --pedantic cleanup.

[citadel.git] / webcit / availability.c

diff --git a/webcit/availability.c b/webcit/availability.c
index ce15c78356f2384a2baaa71253b547d35fcf5861..f8772780bd8c296bb2f65d3c3e08ea5c83db3b98 100644 (file)
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -1,45 +1,33 @@
 /*
  * $Id$
- */
-/**
  *
- * \defgroup CalendarAv  Check attendee availability for scheduling a meeting.
- * \ingroup Calendaring
  */
-/*@{*/
 
 
 #include "webcit.h"
 #include "webserver.h"
 
-/** only available if we have calendaring */
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-
-
-/**
- * \brief verify users avaiability
- * Utility function to fetch a VFREEBUSY type of thing for
- * any specified user.
- * \param who string of the user to search
+/*
+ * Utility function to fetch a VFREEBUSY type of thing for any specified user.
  */
 icalcomponent *get_freebusy_for_user(char *who) {
+       long nLines;
        char buf[SIZ];
-       char *serialized_fb = NULL;
+       StrBuf *serialized_fb = NewStrBuf();
        icalcomponent *fb = NULL;
 
        serv_printf("ICAL freebusy|%s", who);
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
-               serialized_fb = read_server_text();
+               read_server_text(serialized_fb, &nLines);
        }
 
        if (serialized_fb == NULL) {
                return NULL;
        }
        
-       fb = icalcomponent_new_from_string(serialized_fb);
-       free(serialized_fb);
+       fb = icalcomponent_new_from_string(ChrPtr(serialized_fb));
+       FreeStrBuf(&serialized_fb);
        if (fb == NULL) {
                return NULL;
        }
@@ -48,69 +36,13 @@ icalcomponent *get_freebusy_for_user(char *who) {
 }
 
 
-/* TODO: temporary copy from libical, apply this patch to libical... */
-int webcit_icaltime_compare(const struct icaltimetype a_in, const struct icaltimetype b_in) 
-{
-    struct icaltimetype a, b;
-
-    a = icaltime_convert_to_zone(a_in, icaltimezone_get_utc_timezone());
-    b = icaltime_convert_to_zone(b_in, icaltimezone_get_utc_timezone());
-
-    if (a.year > b.year)
-       return 1;
-    else if (a.year < b.year)
-       return -1;
-
-    else if (a.month > b.month)
-       return 1;
-    else if (a.month < b.month)
-       return -1;
-
-    else if (a.day > b.day)
-       return 1;
-    else if (a.day < b.day)
-       return -1;
-
-    /* if both are dates, we are done */
-    if (a.is_date && b.is_date)
-       return 0;
-
-    /* else, if only one is a date (and we already know the date part is equal),
-       then the other is greater */
-    else if (b.is_date)
-       return 1;
-    else if (a.is_date)
-       return -1;
-
-    else if (a.hour > b.hour)
-       return 1;
-    else if (a.hour < b.hour)
-       return -1;
-
-    else if (a.minute > b.minute)
-       return 1;
-    else if (a.minute < b.minute)
-       return -1;
-
-    else if (a.second > b.second)
-       return 1;
-    else if (a.second < b.second)
-       return -1;
-
-    return 0;
-}
-
-
-/**
- * \brief Check if dates are overlapping
+/*
  * Check to see if two events overlap.  
  * (This function is used in both Citadel and WebCit.  If you change it in
- * one place, change it in the other.  Better yet, put it in a library.)
- * \param t1start date one start
- * \param t1end  date one end
- * \param t2start date one start
- * \param t2end date two end
- * \returns nonzero if they do.
+ * one place, change it in the other.  We should seriously consider moving
+ * this function upstream into libical.)
+ *
+ * Returns nonzero if they do overlap.
  */
 int ical_ctdl_is_overlap(
                        struct icaltimetype t1start,
@@ -122,7 +54,7 @@ int ical_ctdl_is_overlap(
        if (icaltime_is_null_time(t1start)) return(0);
        if (icaltime_is_null_time(t2start)) return(0);
 
-       /** First, check for all-day events */
+       /* First, check for all-day events */
        if (t1start.is_date) {
                if (!icaltime_compare_date_only(t1start, t2start)) {
                        return(1);
@@ -150,21 +82,21 @@ int ical_ctdl_is_overlap(
                t2start.hour, t2start.minute, t2end.hour, t2end.minute);
        */
 
-       /** Now check for overlaps using date *and* time. */
+       /* Now check for overlaps using date *and* time. */
 
-       /** First, bail out if either event 1 or event 2 is missing end time. */
+       /* First, bail out if either event 1 or event 2 is missing end time. */
        if (icaltime_is_null_time(t1end)) return(0);
        if (icaltime_is_null_time(t2end)) return(0);
 
-       /** If event 1 ends before event 2 starts, we're in the clear. */
-       if (webcit_icaltime_compare(t1end, t2start) <= 0) return(0);
-       // lprintf(9, "first passed\n");
+       /* If event 1 ends before event 2 starts, we're in the clear. */
+       if (icaltime_compare(t1end, t2start) <= 0) return(0);
+       /* lprintf(9, "first passed\n"); */
 
-       /** If event 2 ends before event 1 starts, we're also ok. */
-       if (webcit_icaltime_compare(t2end, t1start) <= 0) return(0);
-       // lprintf(9, "second passed\n");
+       /* If event 2 ends before event 1 starts, we're also ok. */
+       if (icaltime_compare(t2end, t1start) <= 0) return(0);
+       /* lprintf(9, "second passed\n"); */
 
-       /** Otherwise, they overlap. */
+       /* Otherwise, they overlap. */
        return(1);
 }
 
@@ -314,7 +246,3 @@ void check_attendee_availability(icalcomponent *vevent) {
 
 }
 
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/** @} */