Refactor: libcrmcommon: New pcmk__time_add_years()

To replace crm_time_add_years().

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

lib/common/crmcommon_private.h

@@ -231,6 +231,9 @@ int pcmk__add_time_from_xml(crm_time_t *t, enum pcmk__time_component component,
 G_GNUC_INTERNAL
 void pcmk__set_time_if_earlier(crm_time_t *target, const crm_time_t *source);
 
+G_GNUC_INTERNAL
+void pcmk__time_add_years(crm_time_t *dt, int value);
+
 
 /*
  * IPC

lib/common/iso8601.c

@@ -1423,6 +1423,22 @@ pcmk__set_time_if_earlier(crm_time_t *target, const crm_time_t *source)
     pcmk__time_log(LOG_TRACE, "target", target, flags);
 }
 
+void
+pcmk__time_add_years(crm_time_t *dt, int value)
+{
+    pcmk__assert(dt != NULL);
+
+    if ((value > 0) && ((dt->years + (long long) value) > INT_MAX)) {
+        dt->years = INT_MAX;
+
+    } else if ((value < 0) && ((dt->years + (long long) value) < 1)) {
+        dt->years = 1; // Clip to earliest we can handle (no BCE)
+
+    } else {
+        dt->years += value;
+    }
+}
+
 /*!
  * \internal
  * \brief Convert a \c time_t time to a \c crm_time_t time
@@ -1445,7 +1461,7 @@ pcmk__copy_timet(time_t source_sec)
     if (source->tm_year > 0) {
         // Years since 1900
         target->years = 1900;
-        crm_time_add_years(target, source->tm_year);
+        pcmk__time_add_years(target, source->tm_year);
     }
 
     if (source->tm_yday >= 0) {
@@ -1528,7 +1544,7 @@ pcmk__time_add(const crm_time_t *dt, const crm_time_t *value)
     answer = pcmk__time_copy(dt);
     utc = copy_time_to_utc(value);
 
-    crm_time_add_years(answer, utc->years);
+    pcmk__time_add_years(answer, utc->years);
     add_months(answer, utc->months);
     pcmk__time_add_days(answer, utc->days);
     pcmk__time_add_seconds(answer, utc->seconds);
@@ -1609,7 +1625,7 @@ component_fn(enum pcmk__time_component component)
 {
     switch (component) {
         case pcmk__time_years:
-            return crm_time_add_years;
+            return pcmk__time_add_years;
 
         case pcmk__time_months:
             return add_months;
@@ -1690,10 +1706,10 @@ subtract_time(const crm_time_t *dt1, const crm_time_t *dt2, bool as_duration)
     // Avoid overflow when negating INT_MIN in calculations below
 
     if (utc->years == INT_MIN) {
-        crm_time_add_years(result, -1);
+        pcmk__time_add_years(result, -1);
         utc->years++;
     }
-    crm_time_add_years(result, -utc->years);
+    pcmk__time_add_years(result, -utc->years);
 
     if (utc->months == INT_MIN) {
         add_months(result, -1);
@@ -1768,17 +1784,7 @@ pcmk__time_compare(const crm_time_t *a, const crm_time_t *b)
 void
 crm_time_add_years(crm_time_t *dt, int value)
 {
-    pcmk__assert(dt != NULL);
-
-    if ((value > 0) && ((dt->years + (long long) value) > INT_MAX)) {
-        dt->years = INT_MAX;
-
-    } else if ((value < 0) && ((dt->years + (long long) value) < 1)) {
-        dt->years = 1; // Clip to earliest we can handle (no BCE)
-
-    } else {
-        dt->years += value;
-    }
+    pcmk__time_add_years(dt, value);
 }
 
 static void

lib/common/tests/iso8601/Makefile.am

@@ -12,12 +12,12 @@ include $(top_srcdir)/mk/tap.mk
 include $(top_srcdir)/mk/unittest.mk
 
 # Add "_test" to the end of all test program names to simplify .gitignore.
-check_PROGRAMS = crm_time_add_years_test
-check_PROGRAMS += pcmk__add_time_from_xml_test
+check_PROGRAMS = pcmk__add_time_from_xml_test
 check_PROGRAMS += pcmk__readable_interval_test
 check_PROGRAMS += pcmk__set_time_if_earlier_test
 check_PROGRAMS += pcmk__time_add_days_test
 check_PROGRAMS += pcmk__time_add_seconds_test
+check_PROGRAMS += pcmk__time_add_years_test
 check_PROGRAMS += pcmk__time_format_hr_test
 check_PROGRAMS += pcmk__time_parse_duration_test
 

…/tests/iso8601/crm_time_add_years_test.c …ests/iso8601/pcmk__time_add_years_test.clib/common/tests/iso8601/crm_time_add_years_test.c renamed to lib/common/tests/iso8601/pcmk__time_add_years_test.c lib/common/tests/iso8601/crm_time_add_years_test.c renamed to lib/common/tests/iso8601/pcmk__time_add_years_test.c

@@ -16,6 +16,8 @@
 
 #include <crm/common/iso8601.h>
 
+#include "crmcommon_private.h"              // pcmk__time_add_days
+
 static void
 assert_add_years(const char *orig_date_time, int years,
                  const char *expected_date_time)
@@ -26,7 +28,7 @@ assert_add_years(const char *orig_date_time, int years,
     assert_non_null(orig);
     assert_non_null(expected);
 
-    crm_time_add_years(orig, years);
+    pcmk__time_add_years(orig, years);
     assert_int_equal(pcmk__time_compare(orig, expected), 0);
 
     free(orig);
@@ -36,7 +38,7 @@ assert_add_years(const char *orig_date_time, int years,
 static void
 invalid_argument(void **state)
 {
-    pcmk__assert_asserts(crm_time_add_years(NULL, 1));
+    pcmk__assert_asserts(pcmk__time_add_years(NULL, 1));
 }
 
 static void