From 53dceb8a6de09f6a8052a96b43afc81c0a88edee Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 25 Oct 2025 11:25:41 +0900 Subject: [PATCH] xkbcommon-util: drop 'sym_' prefix from cleanup functions --- src/locale/xkbcommon-util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/locale/xkbcommon-util.c b/src/locale/xkbcommon-util.c index edced7492df..2334587e88c 100644 --- a/src/locale/xkbcommon-util.c +++ b/src/locale/xkbcommon-util.c @@ -38,12 +38,12 @@ static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char REENABLE_WARNING; } -DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct xkb_context *, sym_xkb_context_unref, NULL); -DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct xkb_keymap *, sym_xkb_keymap_unref, NULL); +DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct xkb_context *, sym_xkb_context_unref, xkb_context_unrefp, NULL); +DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct xkb_keymap *, sym_xkb_keymap_unref, xkb_keymap_unrefp, NULL); int verify_xkb_rmlvo(const char *model, const char *layout, const char *variant, const char *options) { - _cleanup_(sym_xkb_context_unrefp) struct xkb_context *ctx = NULL; - _cleanup_(sym_xkb_keymap_unrefp) struct xkb_keymap *km = NULL; + _cleanup_(xkb_context_unrefp) struct xkb_context *ctx = NULL; + _cleanup_(xkb_keymap_unrefp) struct xkb_keymap *km = NULL; const struct xkb_rule_names rmlvo = { .model = model, .layout = layout, -- 2.47.3