From 0910e2f6add87b5989c1196570d3f081576f7a04 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 5 Jan 2024 12:51:07 +0000 Subject: [PATCH] girepository: Drop outdated/unused GIInfoType member MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was deprecated since before libgirepository was moved into this repository. Take the opportunity now to remove it entirely, as it’s a bit confusing to have it in the public API. This should not affect the binary typelib format, as it still has its `BLOB_TYPE_INVALID_0` member, and that will remain in place until the binary format next breaks compatibility (no plans to do that). This is an API break in libgirepository, but since it’s not been in a stable release yet, that’s fine. Signed-off-by: Philip Withnall Helps: #3155 --- girepository/gibaseinfo.c | 2 -- girepository/gifieldinfo.c | 2 -- girepository/gitypes.h | 14 ++++++-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c index ae79bc0a0..575d50035 100644 --- a/girepository/gibaseinfo.c +++ b/girepository/gibaseinfo.c @@ -580,7 +580,6 @@ gi_base_info_get_name (GIBaseInfo *info) case GI_INFO_TYPE_OBJECT: case GI_INFO_TYPE_INTERFACE: case GI_INFO_TYPE_CONSTANT: - case GI_INFO_TYPE_INVALID_0: case GI_INFO_TYPE_UNION: { CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset]; @@ -705,7 +704,6 @@ gi_base_info_is_deprecated (GIBaseInfo *info) case GI_INFO_TYPE_OBJECT: case GI_INFO_TYPE_INTERFACE: case GI_INFO_TYPE_CONSTANT: - case GI_INFO_TYPE_INVALID_0: { CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset]; diff --git a/girepository/gifieldinfo.c b/girepository/gifieldinfo.c index 694333268..b7ed9f7a4 100644 --- a/girepository/gifieldinfo.c +++ b/girepository/gifieldinfo.c @@ -334,7 +334,6 @@ gi_field_info_get_field (GIFieldInfo *field_info, case GI_INFO_TYPE_INTERFACE: case GI_INFO_TYPE_FUNCTION: case GI_INFO_TYPE_CONSTANT: - case GI_INFO_TYPE_INVALID_0: case GI_INFO_TYPE_VALUE: case GI_INFO_TYPE_SIGNAL: case GI_INFO_TYPE_PROPERTY: @@ -517,7 +516,6 @@ gi_field_info_set_field (GIFieldInfo *field_info, case GI_INFO_TYPE_INTERFACE: case GI_INFO_TYPE_FUNCTION: case GI_INFO_TYPE_CONSTANT: - case GI_INFO_TYPE_INVALID_0: case GI_INFO_TYPE_VALUE: case GI_INFO_TYPE_SIGNAL: case GI_INFO_TYPE_PROPERTY: diff --git a/girepository/gitypes.h b/girepository/gitypes.h index c1e83869e..eaf57b07f 100644 --- a/girepository/gitypes.h +++ b/girepository/gitypes.h @@ -179,7 +179,6 @@ typedef union _GIArgument GIArgument; * @GI_INFO_TYPE_OBJECT: object, see [class@GIRepository.ObjectInfo] * @GI_INFO_TYPE_INTERFACE: interface, see [class@GIRepository.InterfaceInfo] * @GI_INFO_TYPE_CONSTANT: constant, see [class@GIRepository.ConstantInfo] - * @GI_INFO_TYPE_INVALID_0: deleted, used to be `GI_INFO_TYPE_ERROR_DOMAIN`. * @GI_INFO_TYPE_UNION: union, see [class@GIRepository.UnionInfo] * @GI_INFO_TYPE_VALUE: enum value, see [class@GIRepository.ValueInfo] * @GI_INFO_TYPE_SIGNAL: signal, see [class@GIRepository.SignalInfo] @@ -214,23 +213,22 @@ typedef enum GI_INFO_TYPE_CALLBACK, GI_INFO_TYPE_STRUCT, GI_INFO_TYPE_BOXED, - GI_INFO_TYPE_ENUM, /* 5 */ + GI_INFO_TYPE_ENUM, /* 5 */ GI_INFO_TYPE_FLAGS, GI_INFO_TYPE_OBJECT, GI_INFO_TYPE_INTERFACE, GI_INFO_TYPE_CONSTANT, - GI_INFO_TYPE_INVALID_0, /* 10 */ - GI_INFO_TYPE_UNION, + GI_INFO_TYPE_UNION, /* 10 */ GI_INFO_TYPE_VALUE, GI_INFO_TYPE_SIGNAL, GI_INFO_TYPE_VFUNC, - GI_INFO_TYPE_PROPERTY, /* 15 */ - GI_INFO_TYPE_FIELD, + GI_INFO_TYPE_PROPERTY, + GI_INFO_TYPE_FIELD, /* 15 */ GI_INFO_TYPE_ARG, GI_INFO_TYPE_TYPE, GI_INFO_TYPE_UNRESOLVED, - GI_INFO_TYPE_CALLABLE, /* 20 */ - GI_INFO_TYPE_REGISTERED_TYPE, + GI_INFO_TYPE_CALLABLE, + GI_INFO_TYPE_REGISTERED_TYPE, /* 20 */ /* keep GI_INFO_TYPE_N_TYPES in sync with this */ } GIInfoType;