various - fix warnings found by cppcheck v1.88

5 files changed, 14 insertions, 14 deletions

diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
index 09ba4431..6e483342 100644
--- a/src/libical/icaltz-util.c
+++ b/src/libical/icaltz-util.c
@@ -309,17 +309,21 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
     num_isstd = (size_t)decode(type_cnts.ttisstdcnt);
     num_types = (size_t)decode(type_cnts.typecnt);
 
-    transitions = calloc(num_trans, sizeof(time_t));
-    if (transitions == NULL) {
-        icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-        goto error;
-    }
-    r_trans = calloc(num_trans, 4);
-    if (r_trans == NULL) {
-        icalerror_set_errno(ICAL_NEWFAILED_ERROR);
+    if (num_trans > 0) {
+        transitions = calloc(num_trans, sizeof(time_t));
+        if (transitions == NULL) {
+            icalerror_set_errno(ICAL_NEWFAILED_ERROR);
+            goto error;
+        }
+        r_trans = calloc(num_trans, 4);
+        if (r_trans == NULL) {
+            icalerror_set_errno(ICAL_NEWFAILED_ERROR);
+            goto error;
+        }
+    } else {
+        icalerror_set_errno(ICAL_FILE_ERROR);
         goto error;
     }
-
     EFREAD(r_trans, 4, num_trans, f);
     temp = r_trans;
     if (num_trans) {
diff --git a/src/libicalss/icaldirset.c b/src/libicalss/icaldirset.c
index 50c12aa7..8133cd4a 100644
--- a/src/libicalss/icaldirset.c
+++ b/src/libicalss/icaldirset.c
@@ -130,7 +130,6 @@ static icalerrorenum icaldirset_read_directory(icaldirset *dset)
     }
 
     /* load all of the cluster names in the directory list */
-    /* cppcheck-suppress readdirCalled */
     for (de = readdir(dp); de != 0; de = readdir(dp)) {
 
         /* Remove known directory names  '.' and '..' */
diff --git a/src/libicalss/icalset.c b/src/libicalss/icalset.c
index 46ebbe87..8555f1e5 100644
--- a/src/libicalss/icalset.c
+++ b/src/libicalss/icalset.c
@@ -159,7 +159,6 @@ static int load(const char *file)
     if (dlerr != NULL) {
         fprintf(stderr, "dlsym error: %s\n", dlerr);
         dlclose(modh);
-       /* cppcheck-suppress resourceLeak */
         return 0;
     }
 
@@ -195,7 +194,6 @@ int icalset_loaddir(const char *path)
         return 0;
     }
 
-    /* cppcheck-suppress readdirCalled */
     while ((dp = readdir(d)) != 0) {
         if (strncmp(dp->d_name, "mod_", 4)) {
             continue;
diff --git a/src/test/stow.c b/src/test/stow.c
index f425288a..5109d924 100644
--- a/src/test/stow.c
+++ b/src/test/stow.c
@@ -583,7 +583,6 @@ void get_options(int argc, char *argv[], struct options_struct *opt)
         }
 
         /* Find password entry for user */
-        /* cppcheck-suppress getpwentCalled; as we don't care about multi-threaded in a test prog */
         while ((pw = getpwent()) != 0) {
             if (strcmp(user, pw->pw_name) == 0) {
                 break;
diff --git a/src/test/timezones.c b/src/test/timezones.c
index 628e1ed8..b3594f7f 100644
--- a/src/test/timezones.c
+++ b/src/test/timezones.c
@@ -79,7 +79,7 @@ int main()
          * the current zone and first day of first month in the year
          */
         start_time = time(NULL);
-        localtime_r(&start_time, &start_tm);
+        (void)localtime_r(&start_time, &start_tm);
         start_tm.tm_hour = 12;
         start_tm.tm_min = 0;
         start_tm.tm_sec = 0;