From b0ea3f3bd48ceacbd2cd254c84b4173dea2b6bfc Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 22 Mar 2024 08:28:34 -0700 Subject: [PATCH] Took ical_dezonify.c back out of WebCit-NG --- webcit-ng/server/caldav_reports.c | 8 ++++---- webcit-ng/server/ical_dezonify.c | 1 - webcit-ng/server/webcit.h | 6 ------ 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 120000 webcit-ng/server/ical_dezonify.c diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c index 1a6b931f6..906d96fcf 100644 --- a/webcit-ng/server/caldav_reports.c +++ b/webcit-ng/server/caldav_reports.c @@ -264,10 +264,10 @@ void caldav_report_one_item(struct http_transaction *h, struct ctdlsession *c, S int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char *end_str) { struct icaltimetype start = icaltime_from_string(start_str); - syslog(LOG_DEBUG, " search start: \033[36m%16s\033[0m (%s)", icaltime_as_ical_string_r(start), icaltime_get_tzid(start)); + syslog(LOG_DEBUG, " search start: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(start), icaltime_get_tzid(start)); struct icaltimetype end = icaltime_from_string(end_str); - syslog(LOG_DEBUG, " search end: \033[36m%16s\033[0m (%s)", icaltime_as_ical_string_r(end), icaltime_get_tzid(end)); + syslog(LOG_DEBUG, " search end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(end), icaltime_get_tzid(end)); // IMPLEMENTATION NOTE: // ical_ctdl_is_overlap() works because icaltime_compare() is really smart. @@ -277,10 +277,10 @@ int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char * // from having to convert everything to UTC before comparing. Nice! icaltimetype dts = icalcomponent_get_dtstart(cal); - syslog(LOG_DEBUG, "component start: \033[36m%16s\033[0m (%s)", icaltime_as_ical_string_r(dts), icaltime_get_tzid(dts)); + syslog(LOG_DEBUG, "component start: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(dts), icaltime_get_tzid(dts)); icaltimetype dte = icalcomponent_get_dtend(cal); - syslog(LOG_DEBUG, "component end: \033[36m%16s\033[0m (%s)", icaltime_as_ical_string_r(dte), icaltime_get_tzid(dte)); + syslog(LOG_DEBUG, "component end: \033[36m%-16s\033[0m (%s)", icaltime_as_ical_string_r(dte), icaltime_get_tzid(dte)); return(ical_ctdl_is_overlap(dts, dte, start, end)); // We have a convenience function for this. } diff --git a/webcit-ng/server/ical_dezonify.c b/webcit-ng/server/ical_dezonify.c deleted file mode 120000 index c3ad895f5..000000000 --- a/webcit-ng/server/ical_dezonify.c +++ /dev/null @@ -1 +0,0 @@ -../../webcit/ical_dezonify.c \ No newline at end of file diff --git a/webcit-ng/server/webcit.h b/webcit-ng/server/webcit.h index f3ce6d356..eb47b76fd 100644 --- a/webcit-ng/server/webcit.h +++ b/webcit-ng/server/webcit.h @@ -212,12 +212,6 @@ char *get_url_param(struct http_transaction *, char *); // ical_ctdl_is_overlap.c int ical_ctdl_is_overlap(struct icaltimetype, struct icaltimetype, struct icaltimetype, struct icaltimetype); -// ical_dezonify.c -icaltimezone *get_default_icaltimezone(void); -void ical_dezonify_backend(icalcomponent *, icalcomponent *, icalproperty *); -void ical_dezonify_recurse(icalcomponent *, icalcomponent *); -void ical_dezonify(icalcomponent *); - // main.c int main(int, char **); -- 2.30.2