summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2022-10-01 21:07:44 -0400
committerAllen Winter <allen.winter@kdab.com>2022-10-01 21:07:44 -0400
commit7830c1a2b35799929c5544a93d8cbf201d91055a (patch)
tree6681eeb6ed47f70d9d64ce58843b69440ca1c9d8
parentca3e2ad983771b90da259994b7a6d7de1fd1abdc (diff)
downloadlibical-git-7830c1a2b35799929c5544a93d8cbf201d91055a.tar.gz
fix coverity warnings - mostly related to YEAR2038 issues
fixed by casting.
-rw-r--r--src/libical/icalcomponent.c2
-rw-r--r--src/libical/icaltz-util.c4
-rw-r--r--src/test/regression-component.c12
-rw-r--r--src/test/stow.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/libical/icalcomponent.c b/src/libical/icalcomponent.c
index cef5df5d..bc160a04 100644
--- a/src/libical/icalcomponent.c
+++ b/src/libical/icalcomponent.c
@@ -865,7 +865,7 @@ void icalcomponent_foreach_recurrence(icalcomponent *comp,
icaltimetype mystart = start;
/* make sure we include any recurrence that ends in timespan */
- icaltime_adjust(&mystart, 0, 0, 0, -(int)dtduration);
+ icaltime_adjust(&mystart, 0, 0, 0, -(int)(long)dtduration);
icalrecur_iterator_set_start(rrule_itr, mystart);
}
diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
index 20642874..ab5b6f85 100644
--- a/src/libical/icaltz-util.c
+++ b/src/libical/icaltz-util.c
@@ -631,8 +631,8 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
/* Read the footer */
if (trans_size == 8 &&
- (footer[0] = fgetc(f)) == '\n' &&
- fgets(footer+1, (int) sizeof(footer)-1, f) &&
+ (footer[0] = (char)fgetc(f)) == '\n' &&
+ fgets(footer+1, (int)sizeof(footer)-1, f) &&
footer[strlen(footer)-1] == '\n') {
tzstr = footer+1;
}
diff --git a/src/test/regression-component.c b/src/test/regression-component.c
index caed9af4..7efe3429 100644
--- a/src/test/regression-component.c
+++ b/src/test/regression-component.c
@@ -291,7 +291,7 @@ void create_new_component_with_va_args()
static void print_span(int c, struct icaltime_span span)
{
- printf("span-->%d, %d\n", (int)span.start, (int)span.end);
+ printf("span-->%ld, %ld\n", (long)span.start, (long)span.end);
if (span.start == 0) {
printf("#%02d start: (empty)\n", c);
} else {
@@ -364,7 +364,7 @@ void test_icalcomponent_get_span()
if (VERBOSE)
print_span(tnum++, span);
- int_is("floating time", (int)span.start, (int)tm1);
+ int_is("floating time", (int)(long)span.start, (int)(long)tm1);
icalcomponent_free(c);
@@ -448,7 +448,7 @@ void test_icalcomponent_get_span()
if (VERBOSE)
print_span(tnum++, span);
- int_is("start == end", (int)span.start, (int)span.end);
+ int_is("start == end", (int)(long)span.start, (int)(long)span.end);
icalcomponent_free(c);
/** test 7
@@ -464,7 +464,7 @@ void test_icalcomponent_get_span()
if (VERBOSE)
print_span(tnum++, span);
- int_is("UTC", (int)span.start, 973296000);
+ int_is("UTC", (int)(long)span.start, 973296000);
icalcomponent_free(c);
/** test 8
@@ -476,7 +476,7 @@ void test_icalcomponent_get_span()
(void *)0);
span = icalcomponent_get_span(c);
- int_is("UTC #2", (int)span.start, 973296000);
+ int_is("UTC #2", (int)(long)span.start, 973296000);
if (VERBOSE)
print_span(tnum++, span);
@@ -493,7 +493,7 @@ void test_icalcomponent_get_span()
if (VERBOSE)
print_span(tnum++, span);
- int_is("start date only", (int)span.end, 973382399);
+ int_is("start date only", (int)(long)span.end, 973382399);
icalcomponent_free(c);
diff --git a/src/test/stow.c b/src/test/stow.c
index a02186ac..2d3e4473 100644
--- a/src/test/stow.c
+++ b/src/test/stow.c
@@ -183,8 +183,8 @@ char *make_mime(const char *to, const char *from, const char *subject,
uname(&uts);
srand((unsigned int)(time(0) << getpid()));
- snprintf(content_id, TMPSIZE_SMALL, "%d-%d@%s", (int)time(0), rand(), uts.nodename);
- snprintf(boundary, TMPSIZE_SMALL, "%d-%d-%s", (int)time(0), rand(), uts.nodename);
+ snprintf(content_id, TMPSIZE_SMALL, "%ld-%d@%s", (long)time(0), rand(), uts.nodename);
+ snprintf(boundary, TMPSIZE_SMALL, "%ld-%d-%s", (long)time(0), rand(), uts.nodename);
//krazy:cond=style
snprintf(mime_part_1, TMPSIZE, "Content-ID: %s\n\
Content-type: text/plain\n\