summaryrefslogtreecommitdiffstats
path: root/src/locale
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2023-02-01 19:17:53 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2023-02-01 19:59:21 +0100
commitc4abc558908d0621ffedc19782e5625567188f28 (patch)
treebe17b7f6d3e0fed386968bfc33c8ea71cfa9a0a7 /src/locale
parentlocale: fix ENOENT handling for vconsole.conf or xorg.conf (diff)
downloadsystemd-c4abc558908d0621ffedc19782e5625567188f28.tar.xz
systemd-c4abc558908d0621ffedc19782e5625567188f28.zip
locale: drop context_clear_x11()
It is used at only place, and mostly trivial. No functional change, just refactoring.
Diffstat (limited to 'src/locale')
-rw-r--r--src/locale/localed-util.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/locale/localed-util.c b/src/locale/localed-util.c
index 3c260d86bd..8f18ecd0d2 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);