Infrastructure: if we don't find the ical headers during boostrap, abort.

[citadel.git] / webcit / calendar_tools.c

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index b6dd7390cb83ae9f6608ffd407d0e8867391919c..daefe82fd27dbe0b8d2b5f3d98cd2ff00ee9335d 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -1,21 +1,15 @@
 /*
  * Miscellaneous functions which handle calendar components.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
@@ -249,7 +243,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        int zone_already_attached;
 
        if (subcomp == NULL) {
-               syslog(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
+               syslog(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
                return NULL;
        }
 
@@ -257,7 +251,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
         * If we're already looking at a full VCALENDAR component, this is probably an error.
         */
        if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) {
-               syslog(3, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n");
+               syslog(LOG_WARNING, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n");
                return subcomp;
        }
 
@@ -287,11 +281,11 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
                                for (i=0; i<5; ++i) {
                                        if (z == attached_zones[i]) {
                                                ++zone_already_attached;
-                                               syslog(9, "zone already attached!!\n");
+                                               syslog(LOG_DEBUG, "zone already attached!!\n");
                                        }
                                }
                                if ((!zone_already_attached) && (num_zones_attached < 5)) {
-                                       syslog(9, "attaching zone %d!\n", num_zones_attached);
+                                       syslog(LOG_DEBUG, "attaching zone %d!\n", num_zones_attached);
                                        attached_zones[num_zones_attached++] = z;
                                }
 
@@ -305,7 +299,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
        /* Encapsulate the VEVENT component into a complete VCALENDAR */
        encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
        if (encaps == NULL) {
-               syslog(3, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
+               syslog(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
                return NULL;
        }