chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'b39a2770ba55637da80e2e389222c59dbea73507'
[elogind.git]
/
src
/
locale
/
localed.c
diff --git
a/src/locale/localed.c
b/src/locale/localed.c
index 087066786e94f9dfee4b561a6d2bedeae29b8b0c..5c0bc2c84eb1a21de07fea922a0f6fe666cc5342 100644
(file)
--- a/
src/locale/localed.c
+++ b/
src/locale/localed.c
@@
-132,12
+132,12
@@
static void context_free_locale(Context *c) {
free_and_replace(&c->locale[p], NULL);
}
free_and_replace(&c->locale[p], NULL);
}
-static void context_free(Context *c
, sd_bus *bus
) {
+static void context_free(Context *c) {
context_free_locale(c);
context_free_x11(c);
context_free_vconsole(c);
context_free_locale(c);
context_free_x11(c);
context_free_vconsole(c);
- bus_verify_polkit_async_registry_free(
bus,
c->polkit_registry);
+ bus_verify_polkit_async_registry_free(c->polkit_registry);
};
static void locale_simplify(Context *c) {
};
static void locale_simplify(Context *c) {
@@
-1161,7
+1161,7
@@
int main(int argc, char *argv[]) {
}
finish:
}
finish:
- context_free(&context
, bus
);
+ context_free(&context);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}