From a73a28634d9d68ae98061529e36023adf353aed7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 6 Oct 2021 12:42:56 -0400 Subject: Remove OstreeTlsCertInteraction bits from introspection We filter out everything named `-private.h` from scanning, which differs from the gtk-doc exclude. Eventually this will be solved when we switch to the new gir-based docs. Came up in https://github.com/ostreedev/ostree-rs/pull/34#discussion_r723337772 --- Makefile-libostree.am | 2 +- apidoc/Makefile.am | 2 +- src/libostree/ostree-fetcher-soup.c | 2 +- .../ostree-tls-cert-interaction-private.h | 43 ++++++++++++++++++++++ src/libostree/ostree-tls-cert-interaction.c | 2 +- src/libostree/ostree-tls-cert-interaction.h | 43 ---------------------- 6 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 src/libostree/ostree-tls-cert-interaction-private.h delete mode 100644 src/libostree/ostree-tls-cert-interaction.h diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 6b94f76f..1f698afc 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -146,7 +146,7 @@ endif if HAVE_LIBSOUP_CLIENT_CERTS libostree_1_la_SOURCES += \ src/libostree/ostree-tls-cert-interaction.c \ - src/libostree/ostree-tls-cert-interaction.h \ + src/libostree/ostree-tls-cert-interaction-private.h \ $(NULL) endif diff --git a/apidoc/Makefile.am b/apidoc/Makefile.am index f8aa5998..f1f8faed 100644 --- a/apidoc/Makefile.am +++ b/apidoc/Makefile.am @@ -87,7 +87,7 @@ IGNORE_HFILES= \ ostree-repo-pull-private.h \ ostree-repo-static-delta-private.h \ ostree-sysroot-private.h \ - ostree-tls-cert-interaction.h \ + ostree-tls-cert-interaction-private.h \ $(NULL) # Images to copy into HTML directory. diff --git a/src/libostree/ostree-fetcher-soup.c b/src/libostree/ostree-fetcher-soup.c index e1e5002e..5f707175 100644 --- a/src/libostree/ostree-fetcher-soup.c +++ b/src/libostree/ostree-fetcher-soup.c @@ -35,7 +35,7 @@ #include "ostree-fetcher.h" #include "ostree-fetcher-util.h" #ifdef HAVE_LIBSOUP_CLIENT_CERTS -#include "ostree-tls-cert-interaction.h" +#include "ostree-tls-cert-interaction-private.h" #endif #include "ostree-enumtypes.h" #include "ostree.h" diff --git a/src/libostree/ostree-tls-cert-interaction-private.h b/src/libostree/ostree-tls-cert-interaction-private.h new file mode 100644 index 00000000..58db65a4 --- /dev/null +++ b/src/libostree/ostree-tls-cert-interaction-private.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2013 Colin Walters + * + * SPDX-License-Identifier: LGPL-2.0+ + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#pragma once + +#include "otutil.h" +#include + +G_BEGIN_DECLS + +#define OSTREE_TYPE_TLS_CERT_INTERACTION (_ostree_tls_cert_interaction_get_type ()) +#define OSTREE_TLS_CERT_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteraction)) +#define OSTREE_TLS_CERT_INTERACTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteractionClass)) +#define OSTREE_IS_TLS_CERT_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), OSTREE_TYPE_TLS_CERT_INTERACTION)) +#define OSTREE_IS_TLS_CERT_INTERACTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), OSTREE_TYPE_TLS_CERT_INTERACTION)) +#define OSTREE_TLS_CERT_INTERACTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteractionClass)) + +typedef struct _OstreeTlsCertInteraction OstreeTlsCertInteraction; +typedef struct _OstreeTlsCertInteractionClass OstreeTlsCertInteractionClass; +G_DEFINE_AUTOPTR_CLEANUP_FUNC(OstreeTlsCertInteraction, g_object_unref) + +GType _ostree_tls_cert_interaction_get_type (void) G_GNUC_CONST; + +OstreeTlsCertInteraction * _ostree_tls_cert_interaction_new (const char *cert_path, + const char *key_path); + +G_END_DECLS diff --git a/src/libostree/ostree-tls-cert-interaction.c b/src/libostree/ostree-tls-cert-interaction.c index bd90166a..7614244e 100644 --- a/src/libostree/ostree-tls-cert-interaction.c +++ b/src/libostree/ostree-tls-cert-interaction.c @@ -19,7 +19,7 @@ #include "config.h" -#include "ostree-tls-cert-interaction.h" +#include "ostree-tls-cert-interaction-private.h" struct _OstreeTlsCertInteraction { diff --git a/src/libostree/ostree-tls-cert-interaction.h b/src/libostree/ostree-tls-cert-interaction.h deleted file mode 100644 index 58db65a4..00000000 --- a/src/libostree/ostree-tls-cert-interaction.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2013 Colin Walters - * - * SPDX-License-Identifier: LGPL-2.0+ - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#pragma once - -#include "otutil.h" -#include - -G_BEGIN_DECLS - -#define OSTREE_TYPE_TLS_CERT_INTERACTION (_ostree_tls_cert_interaction_get_type ()) -#define OSTREE_TLS_CERT_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteraction)) -#define OSTREE_TLS_CERT_INTERACTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteractionClass)) -#define OSTREE_IS_TLS_CERT_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), OSTREE_TYPE_TLS_CERT_INTERACTION)) -#define OSTREE_IS_TLS_CERT_INTERACTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), OSTREE_TYPE_TLS_CERT_INTERACTION)) -#define OSTREE_TLS_CERT_INTERACTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), OSTREE_TYPE_TLS_CERT_INTERACTION, OstreeTlsCertInteractionClass)) - -typedef struct _OstreeTlsCertInteraction OstreeTlsCertInteraction; -typedef struct _OstreeTlsCertInteractionClass OstreeTlsCertInteractionClass; -G_DEFINE_AUTOPTR_CLEANUP_FUNC(OstreeTlsCertInteraction, g_object_unref) - -GType _ostree_tls_cert_interaction_get_type (void) G_GNUC_CONST; - -OstreeTlsCertInteraction * _ostree_tls_cert_interaction_new (const char *cert_path, - const char *key_path); - -G_END_DECLS -- cgit v1.2.1