picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

locale: rename context_free() to context_clear()

This commit is contained in:
Yu Watanabe 2018-11-23 06:12:45 +09:00
parent f6aa61909e
commit 6804d7a849
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/locale/keymap-util.c
View File

@ -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);

2
src/locale/keymap-util.h
View File

@ -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);

2
src/locale/localed.c
View File

@ -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,

4
src/locale/test-keymap-util.c
View File

@ -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__);