From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 1 Feb 2023 18:17:53 +0000 (+0900)
Subject: locale: drop context_clear_x11()
X-Git-Tag: v253-rc2~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F26292%2Fhead;p=thirdparty%2Fsystemd.git

locale: drop context_clear_x11()

It is used at only place, and mostly trivial.
No functional change, just refactoring.
---

diff --git a/src/locale/localed-util.c b/src/locale/localed-util.c
index 3c260d86bdf..8f18ecd0d2f 100644
--- a/src/locale/localed-util.c
+++ b/src/locale/localed-util.c
@@ -154,13 +154,6 @@ int x11_context_copy(X11Context *dest, const X11Context *src) {
         return modified;
 }
 
-static void context_clear_x11(Context *c) {
-        assert(c);
-
-        x11_context_clear(&c->x11_from_xorg);
-        x11_context_clear(&c->x11_from_vc);
-}
-
 void vc_context_clear(VCContext *vc) {
         assert(vc);
 
@@ -235,7 +228,8 @@ void context_clear(Context *c) {
         assert(c);
 
         locale_context_clear(&c->locale_context);
-        context_clear_x11(c);
+        x11_context_clear(&c->x11_from_xorg);
+        x11_context_clear(&c->x11_from_vc);
         vc_context_clear(&c->vc);
 
         c->locale_cache = sd_bus_message_unref(c->locale_cache);