small Splint fixes

7 files changed, 48 insertions, 44 deletions

diff --git a/src/libical/icalerror.c b/src/libical/icalerror.c
index 4b5b3917..b44f27f2 100644
--- a/src/libical/icalerror.c
+++ b/src/libical/icalerror.c
@@ -246,18 +246,21 @@ const char* icalerror_strerror(icalerrorenum e) {
 void ical_bt(void)
 {
 #ifdef HAVE_BACKTRACE
-        void *stack_frames[50];
-        size_t size, i;
-        char **strings;
-
-        size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
-        strings = backtrace_symbols(stack_frames, size);
-        for (i = 0; i < size; i++) {
-                if (strings != NULL)
-                        fprintf(stderr, "%s\n", strings[i]);
-                else
-                        fprintf(stderr, "%p\n", stack_frames[i]);
+    void *stack_frames[50];
+    int i, num;
+    size_t size;
+    char **strings;
+
+    size = sizeof(stack_frames) / sizeof(stack_frames[0]);
+    num = backtrace(stack_frames, (int)size);
+    strings = backtrace_symbols(stack_frames, num);
+    for (i = 0; i < num; i++) {
+        if (strings != NULL) {
+            fprintf(stderr, "%s\n", strings[i]);
+        } else {
+            fprintf(stderr, "%p\n", stack_frames[i]);
         }
-        free(strings);
+    }
+    free(strings);
 #endif
 }
diff --git a/src/libical/icalmime.c b/src/libical/icalmime.c
index 0e504485..f2c9d5be 100644
--- a/src/libical/icalmime.c
+++ b/src/libical/icalmime.c
@@ -150,7 +150,7 @@ static const struct sspm_action_map icalmime_local_action_map[] =
     {SSPM_IMAGE_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
     {SSPM_AUDIO_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
     {SSPM_IMAGE_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-   {SSPM_UNKNOWN_MAJOR_TYPE,SSPM_UNKNOWN_MINOR_TYPE,0,0,0,0}
+    {SSPM_UNKNOWN_MAJOR_TYPE,SSPM_UNKNOWN_MINOR_TYPE, NULL,NULL,NULL,NULL}
 };
 
 #define NUM_PARTS 100 /* HACK. Hard Limit */
diff --git a/src/libical/icalproperty.c b/src/libical/icalproperty.c
index ea5e3852..3903290c 100644
--- a/src/libical/icalproperty.c
+++ b/src/libical/icalproperty.c
@@ -709,7 +709,7 @@ icalproperty_remove_parameter_by_kind(icalproperty* prop, icalparameter_kind kin
     for(p=pvl_head(prop->parameters);p != 0; p = pvl_next(p)){
         icalparameter* param = (icalparameter *)pvl_data (p);
         if (icalparameter_isa(param) == kind) {
-            pvl_remove (prop->parameters, p);
+            (void)pvl_remove (prop->parameters, p);
             icalparameter_free(param);
             break;
         }
@@ -754,7 +754,7 @@ icalproperty_remove_parameter_by_name(icalproperty* prop, const char *name)
           continue;
 
         if (0 == strcmp(kind_string, name)) {
-            pvl_remove (prop->parameters, p);
+            (void)pvl_remove (prop->parameters, p);
             icalparameter_free(param);
             break;
         }
@@ -783,7 +783,7 @@ icalproperty_remove_parameter_by_ref(icalproperty* prop, icalparameter* paramete
         icalparameter* p_param = (icalparameter *)pvl_data (p);
 
         if (icalparameter_has_same_name(parameter, p_param)) {
-            pvl_remove (prop->parameters, p);
+            (void)pvl_remove (prop->parameters, p);
             icalparameter_free(p_param);
             break;
         }
diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
index 38186a44..acb2d913 100644
--- a/src/libical/icalrecur.c
+++ b/src/libical/icalrecur.c
@@ -1074,9 +1074,8 @@ static int omit_invalid(icalrecur_iterator *impl, int day, int month)
 
         case ICAL_SKIP_BACKWARD:
             if (my_month != month) {
-                ucal_add(impl->rscale, UCAL_MONTH,
-                         -abs(my_month - icalrecurrencetype_month_month(month)),
-                         &status);
+                int back_month = -abs(my_month - icalrecurrencetype_month_month(month));
+                ucal_add(impl->rscale, UCAL_MONTH, (int32_t)back_month, &status);
             }
             if (day < 0 || my_day != day) {
                 set_day_of_month(impl, -1);
diff --git a/src/libical/icaltime.c b/src/libical/icaltime.c
index d92dc9fd..dda44782 100644
--- a/src/libical/icaltime.c
+++ b/src/libical/icaltime.c
@@ -89,7 +89,7 @@ static time_t make_time(struct tm *tm, int tzm)
    *  (number of leap days to subtract)
    */
 
-  tim = (tm->tm_year - 70) * 365 + ((tm->tm_year - 1) / 4) - 17;
+  tim = (time_t)((tm->tm_year - 70) * 365 + ((tm->tm_year - 1) / 4) - 17);
 
   /* add number of days elapsed in the current year */
 
@@ -600,44 +600,46 @@ int icaltime_days_in_month(const int month, const int year)
 }
 
 /* 1-> Sunday, 7->Saturday */
-int icaltime_day_of_week(const struct icaltimetype t){
-        UTinstant jt;
+int icaltime_day_of_week(const struct icaltimetype t)
+{
+    UTinstant jt;
 
-        memset(&jt,0,sizeof(UTinstant));
+    memset(&jt,0,sizeof(UTinstant));
 
-        jt.year = t.year;
+    jt.year = t.year;
     jt.month = t.month;
     jt.day = t.day;
     jt.i_hour = 0;
     jt.i_minute = 0;
     jt.i_second = 0;
 
-        juldat(&jt);
+    (void)juldat(&jt);
 
-        return jt.weekday + 1;
+    return jt.weekday + 1;
 }
 
 /** Day of the year that the first day of the week (Sunday) is on.
  */
-int icaltime_start_doy_week(const struct icaltimetype t, int fdow){
-        UTinstant jt;
-        int delta;
+int icaltime_start_doy_week(const struct icaltimetype t, int fdow)
+{
+    UTinstant jt;
+    int delta;
 
-        memset(&jt,0,sizeof(UTinstant));
+    memset(&jt,0,sizeof(UTinstant));
 
-        jt.year = t.year;
+    jt.year = t.year;
     jt.month = t.month;
     jt.day = t.day;
     jt.i_hour = 0;
     jt.i_minute = 0;
     jt.i_second = 0;
 
-        juldat(&jt);
-        caldat(&jt);
+    (void)juldat(&jt);
+    (void)caldat(&jt);
 
-        delta = jt.weekday - (fdow - 1);
-        if (delta < 0) delta += 7;
-        return jt.day_of_year - delta;
+    delta = jt.weekday - (fdow - 1);
+    if (delta < 0) delta += 7;
+    return jt.day_of_year - delta;
 }
 
 /** Day of the year that the first day of the week (Sunday) is on.
@@ -660,21 +662,21 @@ int icaltime_start_doy_of_week(const struct icaltimetype t){
  */
 int icaltime_week_number(const struct icaltimetype ictt)
 {
-        UTinstant jt;
+    UTinstant jt;
 
-        memset(&jt,0,sizeof(UTinstant));
+    memset(&jt,0,sizeof(UTinstant));
 
-        jt.year = ictt.year;
+    jt.year = ictt.year;
     jt.month = ictt.month;
     jt.day = ictt.day;
     jt.i_hour = 0;
     jt.i_minute = 0;
     jt.i_second = 0;
 
-        juldat(&jt);
-        caldat(&jt);
+    (void)juldat(&jt);
+    (void)caldat(&jt);
 
-        return (jt.day_of_year - jt.weekday) / 7;
+    return (jt.day_of_year - jt.weekday) / 7;
 }
 
 /* The first array is for non-leap years, the second for leap years*/
diff --git a/src/libical/icalvalue.c b/src/libical/icalvalue.c
index 4cbed091..fe4411ce 100644
--- a/src/libical/icalvalue.c
+++ b/src/libical/icalvalue.c
@@ -475,7 +475,7 @@ static icalvalue* icalvalue_new_from_string_with_error(icalvalue_kind kind,
     case ICAL_BINARY_VALUE:
     {
         icalattach *attach;
-        attach = icalattach_new_from_data (str, 0, 0);
+        attach = icalattach_new_from_data (str, NULL, 0);
         if ( !attach )
           break;
         value = icalvalue_new_attach (attach);
diff --git a/src/libical/pvl.c b/src/libical/pvl.c
index 4e9bb2c1..edaca18b 100644
--- a/src/libical/pvl.c
+++ b/src/libical/pvl.c
@@ -496,7 +496,7 @@ pvl_clear(pvl_list l)
     while(e != 0)
     {
         next = pvl_next(e);
-        pvl_remove(l,e);
+        (void)pvl_remove(l,e);
         e = next;
     }
 }