diff --git a/include/crm/common/util.h b/include/crm/common/util.h index 0cf13e1e5c..37a5b8843d 100644 --- a/include/crm/common/util.h +++ b/include/crm/common/util.h @@ -1,76 +1,61 @@ /* * Copyright 2004-2025 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_COMMON_UTIL__H #define PCMK__CRM_COMMON_UTIL__H #include // gid_t, mode_t, size_t, time_t, uid_t #include #include #include // uint32_t #include #include #include #include #include #include #include #include #include #include #ifdef __cplusplus extern "C" { #endif /** * \file * \brief Utility functions * \ingroup core */ /* public node attribute functions (from attrs.c) */ char *pcmk_promotion_score_name(const char *rsc_id); /* public Pacemaker Remote functions (from remote.c) */ int crm_default_remote_port(void); int compare_version(const char *version1, const char *version2); -/*! - * \brief Check whether any of specified flags are set in a flag group - * - * \param[in] flag_group The flag group being examined - * \param[in] flags_to_check Which flags in flag_group should be checked - * - * \return true if \p flags_to_check is nonzero and any of its flags are set in - * \p flag_group, or false otherwise - */ -static inline bool -pcmk_any_flags_set(uint64_t flag_group, uint64_t flags_to_check) -{ - return (flag_group & flags_to_check) != 0; -} - void pcmk_common_cleanup(void); char *crm_md5sum(const char *buffer); char *crm_generate_uuid(void); int crm_user_lookup(const char *name, uid_t * uid, gid_t * gid); int pcmk_daemon_user(uid_t *uid, gid_t *gid); #ifdef __cplusplus } #endif #if !defined(PCMK_ALLOW_DEPRECATED) || (PCMK_ALLOW_DEPRECATED == 1) #include #endif #endif diff --git a/include/crm/common/util_compat.h b/include/crm/common/util_compat.h index 1f1ad03a80..f2994258ed 100644 --- a/include/crm/common/util_compat.h +++ b/include/crm/common/util_compat.h @@ -1,59 +1,66 @@ /* * Copyright 2004-2025 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_COMMON_UTIL_COMPAT__H #define PCMK__CRM_COMMON_UTIL_COMPAT__H #include // bool #include // uint64_t #include // gboolean #ifdef __cplusplus extern "C" { #endif /** * \file * \brief Deprecated Pacemaker utilities * \ingroup core * \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 gnutls_global_init() instead void crm_gnutls_global_init(void); //! \deprecated Do not use (will be dropped in a future release) bool crm_is_daemon_name(const char *name); // NOTE: sbd (as of at least 1.5.2) uses this //! \deprecated Do not use static inline gboolean is_set(long long word, long long bit) { return ((word & bit) == bit); } +//! \deprecated Do not use +static inline bool +pcmk_any_flags_set(uint64_t flag_group, uint64_t flags_to_check) +{ + return (flag_group & flags_to_check) != 0; +} + //! \deprecated Do not use static inline bool pcmk_all_flags_set(uint64_t flag_group, uint64_t flags_to_check) { return (flag_group & flags_to_check) == flags_to_check; } //! \deprecated Do not use #define pcmk_is_set(g, f) pcmk_all_flags_set((g), (f)) #ifdef __cplusplus } #endif #endif // PCMK__CRM_COMMON_UTIL_COMPAT__H