From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 22 Nov 2018 21:12:45 +0000 (+0900)
Subject: locale: rename context_free() to context_clear()
X-Git-Tag: v240~243^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6804d7a849612eb470397aa4f4aae46865bfdb92;p=thirdparty%2Fsystemd.git

locale: rename context_free() to context_clear()
---

diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
index 18668a99ab8..495261f4d79 100644
--- a/src/locale/keymap-util.c
+++ b/src/locale/keymap-util.c
@@ -68,7 +68,7 @@ static void context_free_locale(Context *c) {
                 c->locale[p] = mfree(c->locale[p]);
 }
 
-void context_free(Context *c) {
+void context_clear(Context *c) {
         context_free_locale(c);
         context_free_x11(c);
         context_free_vconsole(c);
diff --git a/src/locale/keymap-util.h b/src/locale/keymap-util.h
index 902da689c88..278c74b2ba3 100644
--- a/src/locale/keymap-util.h
+++ b/src/locale/keymap-util.h
@@ -32,7 +32,7 @@ int locale_read_data(Context *c, sd_bus_message *m);
 int vconsole_read_data(Context *c, sd_bus_message *m);
 int x11_read_data(Context *c, sd_bus_message *m);
 
-void context_free(Context *c);
+void context_clear(Context *c);
 int vconsole_convert_to_x11(Context *c);
 int vconsole_write_data(Context *c);
 int x11_convert_to_vconsole(Context *c);
diff --git a/src/locale/localed.c b/src/locale/localed.c
index bb5b132ce7f..b9dffeae5a4 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -711,7 +711,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
 }
 
 int main(int argc, char *argv[]) {
-        _cleanup_(context_free) Context context = {
+        _cleanup_(context_clear) Context context = {
                 .locale_mtime = USEC_INFINITY,
                 .vc_mtime = USEC_INFINITY,
                 .x11_mtime = USEC_INFINITY,
diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c
index e20731b2537..2f82891d60c 100644
--- a/src/locale/test-keymap-util.c
+++ b/src/locale/test-keymap-util.c
@@ -65,7 +65,7 @@ static void test_find_legacy_keymap(void) {
 }
 
 static void test_vconsole_convert_to_x11(void) {
-        _cleanup_(context_free) Context c = {};
+        _cleanup_(context_clear) Context c = {};
 
         log_info("/*** %s ***/", __func__);
 
@@ -119,7 +119,7 @@ static void test_vconsole_convert_to_x11(void) {
 }
 
 static void test_x11_convert_to_vconsole(void) {
-        _cleanup_(context_free) Context c = {};
+        _cleanup_(context_clear) Context c = {};
         int r;
 
         log_info("/*** %s ***/", __func__);