diff --git a/include/crm/pengine/common_compat.h b/include/crm/pengine/common_compat.h index 24e0d5062b..99b3ec8c9e 100644 --- a/include/crm/pengine/common_compat.h +++ b/include/crm/pengine/common_compat.h @@ -1,74 +1,71 @@ /* * Copyright 2004-2024 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 pcmk_role_text(pcmk_role_unknown) instead #define RSC_ROLE_UNKNOWN_S pcmk_role_text(pcmk_role_unknown) //! \deprecated Use pcmk_role_text(pcmk_role_stopped) instead #define RSC_ROLE_STOPPED_S pcmk_role_text(pcmk_role_stopped) //! \deprecated Use pcmk_role_text(pcmk_role_started) instead #define RSC_ROLE_STARTED_S pcmk_role_text(pcmk_role_started) //! \deprecated Use pcmk_role_text(pcmk_role_unpromoted) instead #define RSC_ROLE_UNPROMOTED_S pcmk_role_text(pcmk_role_unpromoted) //! \deprecated Use pcmk_role_text(pcmk_role_promoted) instead #define RSC_ROLE_PROMOTED_S pcmk_role_text(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_role_text() instead const char *role2text(enum rsc_role_e role); //! \deprecated Use pcmk_parse_role() instead enum rsc_role_e text2role(const char *role); //! \deprecated Use pcmk_action_text() instead const char *task2text(enum action_tasks task); -//! \deprecated Use pcmk_parse_action() instead -enum action_tasks text2task(const char *task); - #ifdef __cplusplus } #endif #endif // PCMK__CRM_PENGINE_COMMON_COMPAT__H diff --git a/lib/pengine/common.c b/lib/pengine/common.c index 6b26cb9370..d42df001df 100644 --- a/lib/pengine/common.c +++ b/lib/pengine/common.c @@ -1,50 +1,44 @@ /* * Copyright 2004-2024 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. */ #include #include #include #include #include #include #include // Deprecated functions kept only for backward API compatibility // LCOV_EXCL_START #include const char * role2text(enum rsc_role_e role) { return pcmk_role_text(role); } enum rsc_role_e text2role(const char *role) { return pcmk_parse_role(role); } const char * task2text(enum action_tasks task) { return pcmk_action_text(task); } -enum action_tasks -text2task(const char *task) -{ - return pcmk_parse_action(task); -} - // LCOV_EXCL_STOP // End deprecated API