]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
xkbcommon-util: drop 'sym_' prefix from cleanup functions
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 25 Oct 2025 02:25:41 +0000 (11:25 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 25 Oct 2025 02:25:41 +0000 (11:25 +0900)
src/locale/xkbcommon-util.c

index edced7492dfbeb9467eaa277035185c9e42f1591..2334587e88ccd60f08a1f99513464e732763a6c1 100644 (file)
@@ -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,