Use `icalctime`, `icalmktime`, `icallocaltime_r` instead of `ctime`, etc.

7 files changed, 25 insertions, 25 deletions

diff --git a/src/libicalss/icalspanlist.c b/src/libicalss/icalspanlist.c
index 6b042b12..9ba02b44 100644
--- a/src/libicalss/icalspanlist.c
+++ b/src/libicalss/icalspanlist.c
@@ -215,8 +215,8 @@ void icalspanlist_dump(icalspanlist *sl)
     for (itr = pvl_head(sl->spans); itr != 0; itr = pvl_next(itr)) {
         struct icaltime_span *s = (struct icaltime_span *)pvl_data(itr);
         if (s) {
-            printf("#%02d %d start: %s", ++i, s->is_busy, ctime(&s->start));
-            printf("      end  : %s", ctime(&s->end));
+            printf("#%02d %d start: %s", ++i, s->is_busy, icalctime(&s->start));
+            printf("      end  : %s", icalctime(&s->end));
         }
     }
 }
diff --git a/src/libicalvcal/icalvcal.c b/src/libicalvcal/icalvcal.c
index 29b3c1bf..e6df7b29 100644
--- a/src/libicalvcal/icalvcal.c
+++ b/src/libicalvcal/icalvcal.c
@@ -132,7 +132,7 @@ static void convert_floating_time_to_utc(struct icaltimetype *itt)
     tmp_tm.tm_isdst = -1;
 
     /* Convert to a icaltime_t. */
-    t = mktime(&tmp_tm);
+    t = icalmktime(&tmp_tm);
 
     /* Now convert back to a struct tm, but with a UTC time. */
     if (!icalgmtime_r(&t, &utc_tm)) {
diff --git a/src/test/recur.c b/src/test/recur.c
index e776763f..80f4a2b9 100644
--- a/src/test/recur.c
+++ b/src/test/recur.c
@@ -45,8 +45,8 @@ static void recur_callback(icalcomponent *comp, struct icaltime_span *span, void
 {
     _unused(comp);
     _unused(data);
-    printf("cb: %s", ctime(&span->start));
-    printf("    %s\n", ctime(&span->end));
+    printf("cb: %s", icalctime(&span->start));
+    printf("    %s\n", icalctime(&span->end));
 }
 
 int main(int argc, char *argv[])
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
 
         tt = icaltime_as_timet(start);
 
-        printf("#### %s\n", ctime(&tt));
+        printf("#### %s\n", icalctime(&tt));
 
         icalrecur_iterator_free(ritr);
 
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
              !icaltime_is_null_time(next);
              next = icalrecur_iterator_next(ritr)) {
             tt = icaltime_as_timet(next);
-            printf("  %s", ctime(&tt));
+            printf("  %s", icalctime(&tt));
         }
         icalrecur_iterator_free(ritr);
 
diff --git a/src/test/regression-recur.c b/src/test/regression-recur.c
index d25052d8..4c3a7c6a 100644
--- a/src/test/regression-recur.c
+++ b/src/test/regression-recur.c
@@ -69,8 +69,8 @@ static void recur_callback(icalcomponent *comp, struct icaltime_span *span, void
     _unused(comp);
 
     if (VERBOSE) {
-        printf("recur: %s", ctime(&span->start));
-        printf("       %s", ctime(&span->end));
+        printf("recur: %s", icalctime(&span->start));
+        printf("       %s", icalctime(&span->end));
     }
     *num_recurs = *num_recurs + 1;
 }
@@ -147,7 +147,7 @@ void test_recur_file()
         tt = icaltime_as_timet(start);
 
         if (VERBOSE)
-            printf("#### %s\n", ctime(&tt));
+            printf("#### %s\n", icalctime(&tt));
 
         icalrecur_iterator_free(ritr);
 
@@ -157,7 +157,7 @@ void test_recur_file()
              next = icalrecur_iterator_next(ritr)) {
             tt = icaltime_as_timet(next);
             if (VERBOSE)
-                printf("  %s", ctime(&tt));
+                printf("  %s", icalctime(&tt));
         }
 
         icalrecur_iterator_free(ritr);
diff --git a/src/test/regression-utils.c b/src/test/regression-utils.c
index 937a808d..5673e948 100644
--- a/src/test/regression-utils.c
+++ b/src/test/regression-utils.c
@@ -74,7 +74,7 @@ char *icaltime_as_ctime(struct icaltimetype t)
     icaltime_t tt;
 
     tt = icaltime_as_timet(t);
-    snprintf(ictt_str, sizeof(ictt_str), "%s", ctime(&tt));
+    snprintf(ictt_str, sizeof(ictt_str), "%s", icalctime(&tt));
 
     return ictt_str;
 }
diff --git a/src/test/regression.c b/src/test/regression.c
index 1bf0837b..bced17ab 100644
--- a/src/test/regression.c
+++ b/src/test/regression.c
@@ -1229,14 +1229,14 @@ void print_occur(struct icalrecurrencetype recur, struct icaltimetype start)
     icaltime_t tt = icaltime_as_timet(start);
 
     printf("#### %s\n", icalrecurrencetype_as_string(&recur));
-    printf("#### %s\n", ctime(&tt));
+    printf("#### %s\n", icalctime(&tt));
 
     ritr = icalrecur_iterator_new(recur, start);
     for (next = icalrecur_iterator_next(ritr);
          !icaltime_is_null_time(next);
          next = icalrecur_iterator_next(ritr)) {
         tt = icaltime_as_timet(next);
-        printf("  %s", ctime(&tt));
+        printf("  %s", icalctime(&tt));
     }
 
     icalrecur_iterator_free(ritr);
@@ -1267,7 +1267,7 @@ void test_recur()
 
     for (i = 0; i < 25 && array[i] != 0; i++) {
         if (VERBOSE) {
-            printf("  %s", ctime(&(array[i])));
+            printf("  %s", icalctime(&(array[i])));
         }
     }
 /*    test_increment();*/
@@ -1366,12 +1366,12 @@ void test_expand_recurrence()
     icalrecur_expand_recurrence("FREQ=MONTHLY;BYDAY=MO,WE", now, 5, arr);
 
     if (VERBOSE)
-        printf("Start %s", ctime(&now));
+        printf("Start %s", icalctime(&now));
 
     for (i = 0; i < 5; i++) {
         numfound++;
         if (VERBOSE)
-            printf("i=%d  %s\n", i, ctime(&arr[i]));
+            printf("i=%d  %s\n", i, icalctime(&arr[i]));
     }
     int_is("Get an array of 5 items", numfound, 5);
 }
@@ -1410,7 +1410,7 @@ void icalrecurrencetype_test()
         next = icalrecur_iterator_next(itr);
         tt = icaltime_as_timet(next);
 
-        printf("%s", ctime(&tt));
+        printf("%s", icalctime(&tt));
 
     } while (!icaltime_is_null_time(next));
 
@@ -2021,7 +2021,7 @@ void do_test_time(const char *zone)
                                            icaltimezone_get_builtin_timezone("America/Phoenix"));
 
     if (VERBOSE) {
-        printf("Orig (ctime): %s\n", ical_timet_string(tt));
+        printf("Orig (icalctime): %s\n", ical_timet_string(tt));
         printf("Orig (ical) : %s\n", ictt_as_string(ictt));
         printf("UTC         : %s\n", ictt_as_string(icttutc));
         printf("Los Angeles : %s\n", ictt_as_string(icttla));
@@ -2034,7 +2034,7 @@ void do_test_time(const char *zone)
     if (VERBOSE) {
         printf("\n Daylight Savings \n");
 
-        printf("Orig (ctime): %s\n", ical_timet_string(tt));
+        printf("Orig (icalctime): %s\n", ical_timet_string(tt));
         printf("Orig (ical) : %s\n", ictt_as_string(ictt));
         printf("NY          : %s\n", ictt_as_string(icttny));
     }
@@ -2062,7 +2062,7 @@ void do_test_time(const char *zone)
                                       icaltimezone_get_builtin_timezone("America/Los_Angeles"));
 
     if (VERBOSE) {
-        printf("\nOrig (ctime): %s\n", ical_timet_string(tt));
+        printf("\nOrig (icalctime): %s\n", ical_timet_string(tt));
         printf("Orig (ical) : %s\n", ictt_as_string(ictt));
         printf("LA          : %s\n", ictt_as_string(icttla));
     }
@@ -2881,7 +2881,7 @@ void test_doy()
         stm.tm_year = tt1.year - 1900;
         stm.tm_isdst = -1;
 
-        (void)mktime(&stm);
+        (void)icalmktime(&stm);
 
         doy = icaltime_day_of_year(tt1);
 
diff --git a/src/test/timezones.c b/src/test/timezones.c
index 6491f6fc..3018802b 100644
--- a/src/test/timezones.c
+++ b/src/test/timezones.c
@@ -83,18 +83,18 @@ int main()
          * the current zone and first day of first month in the year
          */
         start_time = icaltime(NULL);
-        (void)localtime_r(&start_time, &start_tm);
+        (void)icallocaltime_r(&start_time, &start_tm);
         start_tm.tm_hour = 12;
         start_tm.tm_min = 0;
         start_tm.tm_sec = 0;
         start_tm.tm_mday = 1;
         start_tm.tm_mon = 0;
-        start_time = mktime(&start_tm);
+        start_time = icalmktime(&start_tm);
 
         /* check time conversion for the next 365 days */
         for (day = 0, curr_time = start_time; day < 365; day++, curr_time += 24 * 60 * 60) {
             /* determine date/time with glibc */
-            localtime_r(&curr_time, &curr_tm);
+            icallocaltime_r(&curr_time, &curr_tm);
             /* determine date/time with libical */
             curr_tt = icaltime_from_timet_with_zone(curr_time, 0, utc_zone);
             curr_tt.zone = utc_zone;    /* workaround: icaltime_from_timet_with_zone()