cleanup warnings

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 1bdca0631d3788b7d87216ec10e77ca3e92e0500..f17cc58195f42e728c41e9680846e0a04e80d863 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -137,7 +137,7 @@ dnl AC_FUNC_VPRINTF
 AC_REPLACE_FUNCS(snprintf)
 AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])])
 
-AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h iconv.h xlocale.h)
+AC_CHECK_HEADERS(fcntl.h limits.h unistd.h iconv.h xlocale.h)
 
 dnl Checks for the zlib compression library.
 saved_CFLAGS="$CFLAGS"

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index 5f2393ff9cb95e8604504051feeeef2bca335065..420b2e71f7401da22085e7e16f9e4416e1811447 100644 (file)
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -272,8 +272,8 @@ void render_MIME_ICS_TPL(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundChar
        wc_mime_attachment *Mime = CTX(CTX_MIME_ATACH);
        icalproperty_method the_method = ICAL_METHOD_NONE;
        icalproperty *method = NULL;
-       icalcomponent *cal;
-       icalcomponent *c;
+       icalcomponent *cal = NULL;
+       icalcomponent *c = NULL;
         WCTemplputParams SubTP;
         WCTemplputParams SuperTP;
 
@@ -538,7 +538,7 @@ int cond_ICalAttendeeState(StrBuf *Target, WCTemplputParams *TP)
        for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
             (c != 0);
             c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
-               /* Recursively process subcomponent * /
+               // Recursively process subcomponent
                cal_process_object(Target, c, recursion_level+1, msgnum, cal_partnum);
        }
        */

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index fb34a4cef9d04b7c748f286412cb5d539e17108e..cbfba25f955d6e5e4c4687e6d3b4868940440fb1 100644 (file)
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -25,18 +25,7 @@
 #include <sys/socket.h>
 #include <syslog.h>
 #include <sys/syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <limits.h>
 #include <sys/resource.h>
 #include <netinet/in.h>

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 6a8d034000d2f31449ac5c5d14e527c8a61f4624..19fe3722d921d0c46930b12afd3f8053ef73a828 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2013 by the citadel.org team
+ * Copyright (c) 1987-2014 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 version 3.
@@ -25,9 +25,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #include <sys/stat.h>
 #ifdef HAVE_LIMITS_H
 #include <limits.h>