Deprecate crm_time_calculate_duration() through crm_time_get_seconds()

cts/cli/regression.dates.exp

@@ -64,7 +64,7 @@ iso8601: Invalid interval specified: P1Y/2019-02-29 00:00:00Z
 =#=#=#= End test: Invalid period - [P1Y/2019-02-29 00:00:00Z] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - [P1Y/2019-02-29 00:00:00Z]
 =#=#=#= Begin test: Invalid period - [2019-01-01 00:00:00Z/P] =#=#=#=
-crm_time_parse_duration 	error: 'P' is not a valid ISO 8601 time duration because nothing follows 'P'
+pcmk__time_parse_duration 	error: 'P' is not a valid ISO 8601 time duration because nothing follows 'P'
 iso8601: Invalid interval specified: 2019-01-01 00:00:00Z/P
 =#=#=#= End test: Invalid period - [2019-01-01 00:00:00Z/P] - Invalid parameter (2) =#=#=#=
 * Passed: iso8601               - Invalid period - [2019-01-01 00:00:00Z/P]

cts/cts-cli.in

@@ -251,7 +251,6 @@ def sanitize_output(s):
         (r'(<cib.*) cib-last-written="[^"]*"', r'\1'),
         (r'crm_feature_set="[^"]*" ', r''),
         (r'@crm_feature_set=[0-9.]+, ', r''),
-        (r'\(crm_time_parse_duration@.*\.c:[0-9]+\)', r'crm_time_parse_duration'),
         (r'\(parse_hms@.*\.c:[0-9]+\)', r'parse_hms'),
         (re.escape(cts_cli_data), r'CTS_CLI_DATA'),
         (r' default="[^"]*"', r' default=""'),

include/crm/common/iso8601.h

@@ -52,12 +52,8 @@ typedef struct crm_time_s crm_time_t;
  *   A timezone of 'Z' denotes UTC time
  */
 crm_time_t *crm_time_new(const char *string);
-crm_time_t *crm_time_new_undefined(void);
 void crm_time_free(crm_time_t * dt);
 
-bool crm_time_is_defined(const crm_time_t *t);
-char *crm_time_as_string(const crm_time_t *dt, int flags);
-
 #define crm_time_log_date          0x001
 #define crm_time_log_timeofday     0x002
 #define crm_time_log_with_timezone 0x004
@@ -69,10 +65,6 @@ char *crm_time_as_string(const crm_time_t *dt, int flags);
 #define crm_time_epoch             0x200
 #define crm_time_usecs             0x400
 
-crm_time_t *crm_time_parse_duration(const char *duration_str);
-crm_time_t *crm_time_calculate_duration(const crm_time_t *dt,
-                                        const crm_time_t *value);
-
 int crm_time_compare(const crm_time_t *a, const crm_time_t *b);
 
 int crm_time_get_timeofday(const crm_time_t *dt, uint32_t *h, uint32_t *m,

include/crm/common/iso8601_compat.h

@@ -79,6 +79,22 @@ void crm_time_free_period(crm_time_period_t *period);
 //! \deprecated Do not use
 crm_time_period_t *crm_time_parse_period(const char *period_str);
 
+//! \deprecated Do not use
+crm_time_t *crm_time_calculate_duration(const crm_time_t *dt,
+                                        const crm_time_t *value);
+
+//! \deprecated Do not use
+crm_time_t *crm_time_parse_duration(const char *duration_str);
+
+//! \deprecated Do not use
+crm_time_t *crm_time_new_undefined(void);
+
+//! \deprecated Do not use
+bool crm_time_is_defined(const crm_time_t *t);
+
+//! \deprecated Do not use
+char *crm_time_as_string(const crm_time_t *dt, int flags);
+
 #ifdef __cplusplus
 }
 #endif

include/crm/common/iso8601_internal.h

@@ -26,13 +26,24 @@
 extern "C" {
 #endif
 
+/* @COMPAT These must be kept in line with the deprecated crm_time_* flags until
+ * those are removed
+ */
+enum pcmk__time_fmt_flags {
+    pcmk__time_fmt_date     = (UINT32_C(1) << 0),
+};
+
 bool pcmk__time_valid_year(int year);
+bool pcmk__time_is_initialized(const crm_time_t *dt);
 void pcmk__time_get_ywd(const crm_time_t *dt, uint32_t *y, uint32_t *w,
                         uint32_t *d);
+char *pcmk__time_text(const crm_time_t *dt, int flags);
 char *pcmk__time_format_hr(const char *format, const crm_time_t *dt, int usec);
 char *pcmk__epoch2str(const time_t *source, uint32_t flags);
 char *pcmk__timespec2str(const struct timespec *ts, uint32_t flags);
 const char *pcmk__readable_interval(unsigned int interval_ms);
+
+crm_time_t *pcmk__time_parse_duration(const char *period_s);
 crm_time_t *pcmk__copy_timet(time_t source_sec);
 
 void pcmk__time_log_as(const char *file, const char *function, int line,

include/crm/common/scheduler.h

@@ -10,19 +10,13 @@
 #ifndef PCMK__CRM_COMMON_SCHEDULER__H
 #define PCMK__CRM_COMMON_SCHEDULER__H
 
-#include <stdbool.h>
-#include <sys/types.h>                  // time_t
-#include <libxml/tree.h>                // xmlNode
-#include <glib.h>                       // GList, GHashTable
+#include <stdbool.h>                    // bool
+#include <stdint.h>                     // uint64_t
 
-#include <crm/common/iso8601.h>         // crm_time_t
+#include <glib.h>                       // GList
+#include <libxml/tree.h>                // xmlNode
 
-#include <crm/common/actions.h>
-#include <crm/common/nodes.h>
-#include <crm/common/resources.h>
-#include <crm/common/roles.h>
-#include <crm/common/rules.h>
-#include <crm/common/scheduler_types.h>
+#include <crm/common/scheduler_types.h> // pcmk_node_t, pcmk_scheduler_t
 
 #ifdef __cplusplus
 extern "C" {

include/crm/pengine/status.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2025 the Pacemaker project contributors
+ * Copyright 2004-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -12,7 +12,7 @@
 
 #  include <glib.h>                 // gboolean
 #  include <stdbool.h>              // bool
-#  include <crm/common/iso8601.h>
+#  include <crm/common/resources.h> // pe_find
 #  include <crm/pengine/pe_types.h> // pcmk_node_t, pcmk_resource_t, etc.
 #  include <crm/pengine/complex.h>
 

include/pacemaker.h

@@ -16,6 +16,7 @@
 #  include <glib.h>
 #  include <libxml/tree.h>
 
+#  include <crm/common/iso8601.h>       // crm_time_t
 #  include <crm/common/scheduler.h>
 #  include <crm/cib/cib_types.h>