diff --git a/include/crm/pengine/common.h b/include/crm/pengine/common.h index 1e423e1346..4dd9745a60 100644 --- a/include/crm/pengine/common.h +++ b/include/crm/pengine/common.h @@ -1,83 +1,70 @@ /* * Copyright 2004-2023 the Pacemaker project contributors * * The version control history for this file may have further details. * * This source code is licensed under the GNU Lesser General Public License * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY. */ #ifndef PCMK__CRM_PENGINE_COMMON__H # define PCMK__CRM_PENGINE_COMMON__H # include # include # include # include #ifdef __cplusplus extern "C" { #endif const char *task2text(enum action_tasks task); enum action_tasks text2task(const char *task); enum rsc_role_e text2role(const char *role); const char *role2text(enum rsc_role_e role); const char *fail2text(enum action_fail_response fail); const char *pe_pref(GHashTable * options, const char *name); -/*! - * \brief Get readable description of a recovery type - * - * \param[in] type Recovery type - * - * \return Static string describing \p type - */ -static inline const char * -recovery2text(enum rsc_recovery_type type) -{ - return pcmk_multiply_active_text(type); -} - typedef struct pe_re_match_data { char *string; int nregs; regmatch_t *pmatch; } pe_re_match_data_t; typedef struct pe_match_data { pe_re_match_data_t *re; GHashTable *params; GHashTable *meta; } pe_match_data_t; typedef struct pe_rsc_eval_data { const char *standard; const char *provider; const char *agent; } pe_rsc_eval_data_t; typedef struct pe_op_eval_data { const char *op_name; guint interval; } pe_op_eval_data_t; typedef struct pe_rule_eval_data { GHashTable *node_hash; // Only used with g_hash_table_lookup() enum rsc_role_e role; crm_time_t *now; // @COMPAT could be const pe_match_data_t *match_data; // @COMPAT could be const pe_rsc_eval_data_t *rsc_data; // @COMPAT could be const pe_op_eval_data_t *op_data; // @COMPAT could be const } pe_rule_eval_data_t; #if !defined(PCMK_ALLOW_DEPRECATED) || (PCMK_ALLOW_DEPRECATED == 1) #include #endif #ifdef __cplusplus } #endif #endif diff --git a/include/crm/pengine/common_compat.h b/include/crm/pengine/common_compat.h index 4330ccf80b..bec36c4899 100644 --- a/include/crm/pengine/common_compat.h +++ b/include/crm/pengine/common_compat.h @@ -1,62 +1,69 @@ /* * Copyright 2004-2023 the Pacemaker project contributors * * The version control history for this file may have further details. * * This source code is licensed under the GNU Lesser General Public License * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY. */ #ifndef PCMK__CRM_PENGINE_COMMON_COMPAT__H # define PCMK__CRM_PENGINE_COMMON_COMPAT__H #include #ifdef __cplusplus extern "C" { #endif /** * \file * \brief Deprecated Pacemaker scheduler utilities * \ingroup pengine * \deprecated Do not include this header directly. The utilities in this * header, and the header itself, will be removed in a future * release. */ //! \deprecated Use (pcmk_role_promoted + 1) instead #define RSC_ROLE_MAX (pcmk_role_promoted + 1) //! \deprecated Use role2text(pcmk_role_unknown) instead #define RSC_ROLE_UNKNOWN_S role2text(pcmk_role_unknown) //! \deprecated Use role2text(pcmk_role_stopped) instead #define RSC_ROLE_STOPPED_S role2text(pcmk_role_stopped) //! \deprecated Use role2text(pcmk_role_started) instead #define RSC_ROLE_STARTED_S role2text(pcmk_role_started) //! \deprecated Use role2text(pcmk_role_unpromoted) instead #define RSC_ROLE_UNPROMOTED_S role2text(pcmk_role_unpromoted) //! \deprecated Use role2text(pcmk_role_promoted) instead #define RSC_ROLE_PROMOTED_S role2text(pcmk_role_promoted) //! \deprecated Do not use #define RSC_ROLE_UNPROMOTED_LEGACY_S "Slave" //! \deprecated Do not use #define RSC_ROLE_SLAVE_S RSC_ROLE_UNPROMOTED_LEGACY_S //! \deprecated Do not use #define RSC_ROLE_PROMOTED_LEGACY_S "Master" //! \deprecated Do not use #define RSC_ROLE_MASTER_S RSC_ROLE_PROMOTED_LEGACY_S +//! \deprecated Use pcmk_multiply_active_text() instead +static inline const char * +recovery2text(enum rsc_recovery_type type) +{ + return pcmk_multiply_active_text(type); +} + #ifdef __cplusplus } #endif #endif // PCMK__CRM_PENGINE_COMMON_COMPAT__H