chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network-address,test-network: avoid undefined behaviour
[elogind.git]
/
src
/
locale
/
localed.c
diff --git
a/src/locale/localed.c
b/src/locale/localed.c
index 0aaa63de853c69917579e04d4e2d21bd74a1889c..ed763c36f62a53f131f875db52226758d8f1352c 100644
(file)
--- a/
src/locale/localed.c
+++ b/
src/locale/localed.c
@@
-23,7
+23,6
@@
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
-#include <sys/capability.h>
#include "sd-bus.h"
#include "sd-bus.h"
@@
-40,6
+39,7
@@
#include "bus-message.h"
#include "event-util.h"
#include "locale-util.h"
#include "bus-message.h"
#include "event-util.h"
#include "locale-util.h"
+#include "selinux-util.h"
#ifdef HAVE_XKBCOMMON
#include <xkbcommon/xkbcommon.h>
#ifdef HAVE_XKBCOMMON
#include <xkbcommon/xkbcommon.h>
@@
-1011,7
+1011,7
@@
static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata
static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char *format, va_list args) {
const char *fmt;
static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char *format, va_list args) {
const char *fmt;
- fmt = str
append
a("libxkbcommon: ", format);
+ fmt = str
join
a("libxkbcommon: ", format);
log_internalv(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, fmt, args);
}
log_internalv(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, fmt, args);
}