diff --git a/include/crm/cib/Makefile.am b/include/crm/cib/Makefile.am index 0cd236c14a..28b2df8666 100644 --- a/include/crm/cib/Makefile.am +++ b/include/crm/cib/Makefile.am @@ -1,16 +1,15 @@ # # Copyright 2012-2021 the Pacemaker project contributors # # The version control history for this file may have further details. # # This source code is licensed under the GNU General Public License version 2 # or later (GPLv2+) WITHOUT ANY WARRANTY. # MAINTAINERCLEANFILES = Makefile.in headerdir=$(pkgincludedir)/crm/cib noinst_HEADERS = internal.h header_HEADERS = cib_types.h \ - util.h \ - util_compat.h + util.h diff --git a/include/crm/cib/util.h b/include/crm/cib/util.h index b68c061b86..8da9b4d007 100644 --- a/include/crm/cib/util.h +++ b/include/crm/cib/util.h @@ -1,65 +1,61 @@ /* * 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_CIB_UTIL__H # define PCMK__CRM_CIB_UTIL__H #include // gboolean #include // xmlNode #include // cib_t #ifdef __cplusplus extern "C" { #endif /* Utility functions */ xmlNode *createEmptyCib(int cib_epoch); gboolean cib_version_details(xmlNode * cib, int *admin_epoch, int *epoch, int *updates); int update_attr_delegate(cib_t * the_cib, int call_options, const char *section, const char *node_uuid, const char *set_type, const char *set_name, const char *attr_id, const char *attr_name, const char *attr_value, gboolean to_console, const char *user_name, const char *node_type); int find_nvpair_attr_delegate(cib_t * the_cib, const char *attr, const char *section, const char *node_uuid, const char *set_type, const char *set_name, const char *attr_id, const char *attr_name, gboolean to_console, char **value, const char *user_name); int read_attr_delegate(cib_t * the_cib, const char *section, const char *node_uuid, const char *set_type, const char *set_name, const char *attr_id, const char *attr_name, char **attr_value, gboolean to_console, const char *user_name); int delete_attr_delegate(cib_t * the_cib, int options, const char *section, const char *node_uuid, const char *set_type, const char *set_name, const char *attr_id, const char *attr_name, const char *attr_value, gboolean to_console, const char *user_name); int query_node_uuid(cib_t * the_cib, const char *uname, char **uuid, int *is_remote_node); // NOTE: sbd (as of at least 1.5.2) uses this int cib_apply_patch_event(xmlNode *event, xmlNode *input, xmlNode **output, int level); -#if !defined(PCMK_ALLOW_DEPRECATED) || (PCMK_ALLOW_DEPRECATED == 1) -#include -#endif - #ifdef __cplusplus } #endif #endif diff --git a/include/crm/cib/util_compat.h b/include/crm/cib/util_compat.h deleted file mode 100644 index 8b3cf01ecd..0000000000 --- a/include/crm/cib/util_compat.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2021-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_CIB_UTIL_COMPAT__H -# define PCMK__CRM_CIB_UTIL_COMPAT__H - -#include // xmlNode - -#include // cib_t - -#include -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file - * \brief Deprecated Pacemaker configuration utilities - * \ingroup cib - * \deprecated Do not include this header directly. The utilities in this - * header, and the header itself, will be removed in a future - * release. - */ - -#ifdef __cplusplus -} -#endif - -#endif // PCMK__CRM_CIB_UTIL_COMPAT__H