lots of small fixes found by cppcheck

6 files changed, 85 insertions, 68 deletions

diff --git a/src/libicalss/icalbdbset.c b/src/libicalss/icalbdbset.c
index 04a8e329..caf6fa14 100644
--- a/src/libicalss/icalbdbset.c
+++ b/src/libicalss/icalbdbset.c
@@ -151,13 +151,13 @@ icalset *icalbdbset_init(icalset *set, const char *dsn, void *options_in)
 {
     _unused(dsn)
     icalbdbset *bset = (icalbdbset *)set;
-    icalbdbset_options *options = options_in;
+    icalbdbset_options *options = (icalbdbset_options *)options_in;
     int ret;
     DB *cal_db;
     char *subdb_name=NULL;
 
     if (options == NULL) {
-        *options = icalbdbset_options_default;
+       *options = icalbdbset_options_default;
     }
 
     switch (options->subdb) {
@@ -957,13 +957,12 @@ icalerrorenum icalbdbset_remove_component(icalset *set, icalcomponent *child)
 
 int icalbdbset_count_components(icalset *set, icalcomponent_kind kind)
 {
-    icalbdbset *bset = (icalbdbset *)set;
-
     if (set == 0) {
         icalerror_set_errno(ICAL_BADARG_ERROR);
         return -1;
     }
 
+    icalbdbset *bset = (icalbdbset *)set;
     return icalcomponent_count_components(bset->cluster, kind);
 }
 
@@ -1203,13 +1202,14 @@ icalcomponent *icalbdbset_get_first_component(icalset *set)
     return 0;
 }
 
-icalsetiter icalbdbset_begin_component(
-    icalset *set, icalcomponent_kind kind, icalgauge *gauge, const char *tzid)
+icalsetiter
+icalbdbset_begin_component(icalset *set, icalcomponent_kind kind,
+                           icalgauge *gauge, const char *tzid)
 {
     icalsetiter itr = icalsetiter_null;
     icalcomponent *comp = NULL;
     icalcompiter citr;
-    icalbdbset *bset = (icalbdbset *) set;
+    icalbdbset *bset;
     struct icaltimetype start, next;
     icalproperty *dtstart, *rrule, *prop, *due;
     struct icalrecurrencetype recur;
@@ -1218,6 +1218,7 @@ icalsetiter icalbdbset_begin_component(
     int orig_time_was_utc = 0;
 
     icalerror_check_arg_re((set != 0), "set", icalsetiter_null);
+    bset = (icalbdbset *)set;
 
     itr.gauge = gauge;
     itr.tzid = tzid;
@@ -1321,7 +1322,7 @@ icalsetiter icalbdbset_begin_component(
     getNextComp:
         if ((rrule != NULL && itr.last_component == NULL) ||
             (rrule == NULL)) {
-            comp =  icalcompiter_next(&citr);
+            comp = icalcompiter_next(&citr);
             comp = icalcompiter_deref(&citr);
         }
     } /* while */
diff --git a/src/libicalss/icalcstpserver.c b/src/libicalss/icalcstpserver.c
index 5728a8d1..c0a59384 100644
--- a/src/libicalss/icalcstpserver.c
+++ b/src/libicalss/icalcstpserver.c
@@ -23,7 +23,7 @@
     ======================================================================*/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <libical/ical.h>
@@ -40,18 +40,13 @@
 #include <stdlib.h> /* for malloc */
 #include <string.h>
 
-
-
 struct icalcstps_impl {
-	int timeout;
-	icalparser *parser;
-	enum cstps_state major_state;
-	struct icalcstps_commandfp commandfp;
+    int timeout;
+    icalparser *parser;
+    enum cstps_state major_state;
+    struct icalcstps_commandfp commandfp;
 };
 
-
-
-
 /* This state machine is a Mealy-type: actions occur on the
    transitions, not in the states.
    
@@ -144,19 +139,18 @@ void icalcstps_free(icalcstps* cstp);
 
 int icalcstps_set_timeout(icalcstps* cstp, int sec) 
 {
-    struct icalcstps_impl *impl = (struct icalcstps_impl *) cstp;
-
     icalerror_check_arg_rz( (cstp!=0), "cstp");
 
+    struct icalcstps_impl *impl = (struct icalcstps_impl *) cstp;
     impl->timeout = sec;
 
     return sec;
 }
 
 typedef struct icalcstps_response {	
-	icalrequeststatus code;
-	char caluid[1024];
-	void* result;
+    icalrequeststatus code;
+    char caluid[1024];
+    void *result;
 } icalcstps_response;
 
 
@@ -164,41 +158,50 @@ icalerrorenum prep_abort(struct icalcstps_impl* impl, char* data)
 {
     return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_authenticate(struct icalcstps_impl* impl, char* data)
 {    return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_capability(struct icalcstps_impl* impl, char* data)
 {    return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_calidexpand(struct icalcstps_impl* impl, char* data)
 {
     return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_continue(struct icalcstps_impl* impl, char* data)
 {
     return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_disconnect(struct icalcstps_impl* impl, char* data)
 {
     return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_identify(struct icalcstps_impl* impl, char* data)
 {
     return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_starttls(struct icalcstps_impl* impl, char* data)
 {
     return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_upnexpand(struct icalcstps_impl* impl, char* data)
 {
     return ICAL_NO_ERROR;
 }
+
 icalerrorenum prep_sendata(struct icalcstps_impl* impl, char* data)
 {    return ICAL_NO_ERROR;
 }
 
-char* icalcstps_process_incoming(icalcstps* cstp, char* input)
+char *icalcstps_process_incoming(icalcstps* cstp, char* input)
 {
     struct icalcstps_impl *impl = (struct icalcstps_impl *) cstp;
     char *i;
@@ -227,7 +230,11 @@ char* icalcstps_process_incoming(icalcstps* cstp, char* input)
     }
 
     printf("cmd: %s\n",cmd_or_resp);
-    printf("data: %s\n",data);
+    if (data) {
+        printf("data: %s\n",data);
+    } else {
+        printf("data is empty\n");
+    }
 	
     /* extract the command, look up in the state table, and dispatch
        to the proper handler */    
@@ -259,8 +266,6 @@ char* icalcstps_process_incoming(icalcstps* cstp, char* input)
 
     /* Read data until we get a end of data marker */
 
-
-
 struct icalcstps_server_stubs {
   icalerrorenum (*abort)(icalcstps* cstp);
   icalerrorenum (*authenticate)(icalcstps* cstp, char* mechanism, 
diff --git a/src/libicalss/icaldirset.c b/src/libicalss/icaldirset.c
index a12fbcc8..1faec7cd 100644
--- a/src/libicalss/icaldirset.c
+++ b/src/libicalss/icaldirset.c
@@ -51,7 +51,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <libical/ical.h>
@@ -200,12 +200,13 @@ icalerrorenum icaldirset_read_directory(icaldirset *dset)
 
 icalset *icaldirset_init(icalset *set, const char *dir, void *options_in)
 {
-    icaldirset *dset = (icaldirset *)set;
+    icaldirset *dset;
     icaldirset_options *options = options_in;
     struct stat sbuf;
 
     icalerror_check_arg_rz((dir != 0), "dir");
     icalerror_check_arg_rz((set != 0), "set");
+    dset = (icaldirset *)set;
 
     if (stat(dir, &sbuf) != 0) {
         icalerror_set_errno(ICAL_FILE_ERROR);
@@ -295,7 +296,7 @@ int icaldirset_next_uid_number(icaldirset *dset)
 {
     char sequence = 0;
     char temp[128];
-    char filename[ICAL_PATH_MAX];
+    char filename[ICAL_PATH_MAX] = {0};
     char *r;
     FILE *f;
     struct stat sbuf;
@@ -371,7 +372,7 @@ icalerrorenum icaldirset_next_cluster(icaldirset *dset)
 
 static void icaldirset_add_uid(icalcomponent *comp)
 {
-    char uidstring[ICAL_PATH_MAX];
+    char uidstring[ICAL_PATH_MAX] = {0};
     icalproperty *uid;
 #ifndef WIN32
     struct utsname unamebuf;
@@ -407,17 +408,19 @@ static void icaldirset_add_uid(icalcomponent *comp)
 
 icalerrorenum icaldirset_add_component(icalset *set, icalcomponent *comp)
 {
-    char clustername[ICAL_PATH_MAX];
+    char clustername[ICAL_PATH_MAX] = {0};
     icalproperty *dt = 0;
     icalvalue *v;
     struct icaltimetype tm;
     icalerrorenum error = ICAL_NO_ERROR;
     icalcomponent *inner;
-    icaldirset *dset = (icaldirset *) set;
+    icaldirset *dset;
 
-    icalerror_check_arg_rz((dset != 0), "dset");
+    icalerror_check_arg_rz((set != 0), "set");
     icalerror_check_arg_rz((comp != 0), "comp");
 
+    dset = (icaldirset *)set;
+
     icaldirset_add_uid(comp);
 
     /* Determine which cluster this object belongs in. This is a HACK */
@@ -494,16 +497,19 @@ icalerrorenum icaldirset_add_component(icalset *set, icalcomponent *comp)
 
 icalerrorenum icaldirset_remove_component(icalset *set, icalcomponent *comp)
 {
-    icaldirset *dset = (icaldirset *)set;
-    icalcomponent *filecomp = icalcluster_get_component(dset->cluster);
-
+    icaldirset *dset;
+    icalcomponent *filecomp;
     icalcompiter i;
     int found = 0;
 
     icalerror_check_arg_re((set != 0), "set", ICAL_BADARG_ERROR);
     icalerror_check_arg_re((comp != 0), "comp", ICAL_BADARG_ERROR);
+
+    dset = (icaldirset *)set;
     icalerror_check_arg_re((dset->cluster != 0), "Cluster pointer", ICAL_USAGE_ERROR);
 
+    filecomp = icalcluster_get_component(dset->cluster);
+
     for (i = icalcomponent_begin_component(filecomp, ICAL_ANY_COMPONENT);
          icalcompiter_deref(&i) != 0; icalcompiter_next(&i)) {
 
@@ -567,7 +573,7 @@ icalcomponent *icaldirset_fetch_match(icalset *set, icalcomponent *c)
 icalcomponent *icaldirset_fetch(icalset *set, icalcomponent_kind kind, const char *uid)
 {
     _unused(kind)
-    icaldirset *dset = (icaldirset *)set;
+    icaldirset *dset;
     icalgauge *gauge;
     icalgauge *old_gauge;
     icalcomponent *c;
@@ -579,7 +585,7 @@ icalcomponent *icaldirset_fetch(icalset *set, icalcomponent_kind kind, const cha
     snprintf(sql, 256, "SELECT * FROM VEVENT WHERE UID = \"%s\"", uid);
 
     gauge = icalgauge_new_from_sql(sql, 0);
-
+    dset = (icaldirset *)set;
     old_gauge = dset->gauge;
     dset->gauge = gauge;
 
@@ -609,11 +615,12 @@ int icaldirset_has_uid(icalset *set, const char *uid)
 
 icalerrorenum icaldirset_select(icalset *set, icalgauge *gauge)
 {
-    icaldirset *dset = (icaldirset *)set;
+    icaldirset *dset;
 
     icalerror_check_arg_re((set != 0), "set", ICAL_BADARG_ERROR);
     icalerror_check_arg_re((gauge != 0), "gauge", ICAL_BADARG_ERROR);
-
+    
+    dset = (icaldirset *)set;
     dset->gauge = gauge;
 
     return ICAL_NO_ERROR;
@@ -708,11 +715,12 @@ icalcomponent *icaldirset_get_first_component(icalset *set)
 
 icalcomponent *icaldirset_get_next_component(icalset *set)
 {
-    icaldirset *dset = (icaldirset *)set;
+    icaldirset *dset;
     icalcomponent *c;
     icalerrorenum error;
 
     icalerror_check_arg_rz((set != 0), "set");
+    dset = (icaldirset *)set;
 
     if (dset->cluster == 0) {
         icalerror_warn("icaldirset_get_next_component called with a NULL cluster (Caller must call icaldirset_get_first_component first");
diff --git a/src/libicalss/icalfileset.c b/src/libicalss/icalfileset.c
index ecbe785f..ea781dd7 100644
--- a/src/libicalss/icalfileset.c
+++ b/src/libicalss/icalfileset.c
@@ -95,7 +95,7 @@ icalset *icalfileset_new_writer(const char *path)
 icalset *icalfileset_init(icalset *set, const char *path, void *options_in)
 {
     icalfileset_options *options = (options_in) ? options_in : &icalfileset_options_default;
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset = (icalfileset *)set;
     int flags;
     mode_t mode;
     off_t cluster_file_size;
@@ -257,10 +257,10 @@ int icalfileset_filesize(icalfileset *fset)
 
 void icalfileset_free(icalset *set)
 {
-    icalfileset *fset = (icalfileset *) set;
-
     icalerror_check_arg_rv((set != 0), "set");
 
+    icalfileset *fset = (icalfileset *)set;
+
     if (fset->cluster != 0) {
         icalfileset_commit(set);
         icalcomponent_free(fset->cluster);
@@ -359,7 +359,7 @@ icalerrorenum icalfileset_commit(icalset *set)
     char *str;
     icalcomponent *c;
     size_t write_size = 0;
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset = (icalfileset *)set;
 #ifdef _WIN32_WCE
     wchar_t *wtmp = 0;
     PROCESS_INFORMATION pi;
@@ -453,9 +453,9 @@ void icalfileset_mark(icalset *set)
 
 icalcomponent *icalfileset_get_component(icalset *set)
 {
-    icalfileset *fset = (icalfileset *) set;
     icalerror_check_arg_rz((set != 0), "set");
 
+    icalfileset *fset = (icalfileset *)set;
     return fset->cluster;
 }
 
@@ -464,11 +464,12 @@ icalcomponent *icalfileset_get_component(icalset *set)
 icalerrorenum icalfileset_add_component(icalset *set,
                                         icalcomponent *child)
 {
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
 
     icalerror_check_arg_re((set != 0), "set", ICAL_BADARG_ERROR);
     icalerror_check_arg_re((child != 0), "child", ICAL_BADARG_ERROR);
 
+    fset = (icalfileset *)set;
     icalcomponent_add_component(fset->cluster, child);
 
     icalfileset_mark(set);
@@ -476,14 +477,14 @@ icalerrorenum icalfileset_add_component(icalset *set,
     return ICAL_NO_ERROR;
 }
 
-icalerrorenum icalfileset_remove_component(icalset *set,
-        icalcomponent *child)
+icalerrorenum icalfileset_remove_component(icalset *set, icalcomponent *child)
 {
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
 
     icalerror_check_arg_re((set != 0), "set", ICAL_BADARG_ERROR);
     icalerror_check_arg_re((child != 0), "child", ICAL_BADARG_ERROR);
 
+    fset = (icalfileset *)set;
     icalcomponent_remove_component(fset->cluster, child);
 
     icalfileset_mark(set);
@@ -491,25 +492,26 @@ icalerrorenum icalfileset_remove_component(icalset *set,
     return ICAL_NO_ERROR;
 }
 
-int icalfileset_count_components(icalset *set,
-                                 icalcomponent_kind kind)
+int icalfileset_count_components(icalset *set, icalcomponent_kind kind)
 {
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
 
     if (set == 0) {
         icalerror_set_errno(ICAL_BADARG_ERROR);
         return -1;
     }
 
+    fset = (icalfileset *)set;
     return icalcomponent_count_components(fset->cluster, kind);
 }
 
 icalerrorenum icalfileset_select(icalset *set, icalgauge *gauge)
 {
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
 
     icalerror_check_arg_re(gauge != 0, "gauge", ICAL_BADARG_ERROR);
 
+    fset = (icalfileset *)set;
     fset->gauge = gauge;
 
     return ICAL_NO_ERROR;
@@ -517,20 +519,22 @@ icalerrorenum icalfileset_select(icalset *set, icalgauge *gauge)
 
 void icalfileset_clear(icalset *set)
 {
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
 
     icalerror_check_arg_rv(set != 0, "set");
 
+    fset = (icalfileset *)set;
     fset->gauge = 0;
 }
 
 icalcomponent *icalfileset_fetch(icalset *set, icalcomponent_kind kind, const char *uid)
 {
     _unused(kind)
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
     icalcompiter i;
 
     icalerror_check_arg_rz(set != 0, "set");
+    fset = (icalfileset *)set;
 
     for (i = icalcomponent_begin_component(fset->cluster, ICAL_ANY_COMPONENT);
          icalcompiter_deref(&i) != 0; icalcompiter_next(&i)) {
@@ -632,7 +636,7 @@ struct icalfileset_id icalfileset_get_id(icalcomponent *comp)
    RECURRENCE-ID */
 icalcomponent *icalfileset_fetch_match(icalset *set, icalcomponent *comp)
 {
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset = (icalfileset *)set;
     icalcompiter i;
 
     struct icalfileset_id comp_id, match_id;
@@ -677,19 +681,21 @@ icalerrorenum icalfileset_modify(icalset *set, icalcomponent *old,
 /* Iterate through components */
 icalcomponent *icalfileset_get_current_component(icalset *set)
 {
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
 
     icalerror_check_arg_rz((set != 0), "set");
 
+    fset = (icalfileset *)set;
     return icalcomponent_get_current_component(fset->cluster);
 }
 
 icalcomponent *icalfileset_get_first_component(icalset *set)
 {
     icalcomponent *c = 0;
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
 
     icalerror_check_arg_rz((set != 0), "set");
+    fset = (icalfileset *)set;
 
     do {
         if (c == 0) {
@@ -712,10 +718,11 @@ icalcomponent *icalfileset_get_first_component(icalset *set)
 
 icalcomponent *icalfileset_get_next_component(icalset *set)
 {
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
     icalcomponent *c;
 
     icalerror_check_arg_rz((set != 0), "set");
+    fset = (icalfileset *)set;
 
     do {
         c = icalcomponent_get_next_component(fset->cluster,
@@ -736,7 +743,7 @@ icalsetiter icalfileset_begin_component(icalset* set, icalcomponent_kind kind, i
     icalsetiter itr = icalsetiter_null;
     icalcomponent* comp = NULL;
     icalcompiter citr;
-    icalfileset *fset = (icalfileset*) set;
+    icalfileset *fset = (icalfileset*)set;
 
     icalerror_check_arg_re((set!=0), "set", icalsetiter_null);
 
@@ -764,7 +771,7 @@ icalsetiter icalfileset_begin_component(icalset *set, icalcomponent_kind kind, i
     icalsetiter itr = icalsetiter_null;
     icalcomponent *comp = NULL;
     icalcompiter citr;
-    icalfileset *fset = (icalfileset *) set;
+    icalfileset *fset;
     struct icaltimetype start, next;
     icalproperty *dtstart, *rrule, *prop, *due;
     struct icalrecurrencetype recur;
@@ -775,6 +782,7 @@ icalsetiter icalfileset_begin_component(icalset *set, icalcomponent_kind kind, i
     start = icaltime_from_timet(time(0), 0);
     itr.gauge = gauge;
 
+    fset = (icalfileset *)set;
     citr = icalcomponent_begin_component(fset->cluster, kind);
     comp = icalcompiter_deref(&citr);
 
diff --git a/src/libicalss/icalset.c b/src/libicalss/icalset.c
index 76d9f962..33482857 100644
--- a/src/libicalss/icalset.c
+++ b/src/libicalss/icalset.c
@@ -222,10 +222,6 @@ static void icalset_init(void)
     pvl_push(icalset_kinds, &icalset_bdb4set_init);
 #endif
 
-#ifdef EXT_PATH
-    icalset_loaddir(EXT_PATH);
-#endif
-
     icalset_init_done++;
 }
 
diff --git a/src/libicalss/icalsslexer.c b/src/libicalss/icalsslexer.c
index c97f3bc1..dcf51441 100644
--- a/src/libicalss/icalsslexer.c
+++ b/src/libicalss/icalsslexer.c
@@ -556,7 +556,6 @@ char *yytext_ptr;
 
 #include "icalssyacc.h"
 #include "icalgaugeimpl.h"
-#include "assert.h"
 
 #include <string.h> /* For strdup() */