chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add helper for fnmatch over strv
[elogind.git]
/
src
/
libsystemd-terminal
/
idev-keyboard.c
diff --git
a/src/libsystemd-terminal/idev-keyboard.c
b/src/libsystemd-terminal/idev-keyboard.c
index bcb2a4b1e239140d3798e2499225f35f3411f9ce..6ee3d8150c22aaf49a752173c00faa9e0e2acdf8 100644
(file)
--- a/
src/libsystemd-terminal/idev-keyboard.c
+++ b/
src/libsystemd-terminal/idev-keyboard.c
@@
-445,8
+445,7
@@
static int kbdctx_query_locale(kbdctx *kc) {
return 0;
error:
return 0;
error:
- log_debug_errno(r, "idev-keyboard: cannot send GetAll to locale1: %m");
- return r;
+ return log_debug_errno(r, "idev-keyboard: cannot send GetAll to locale1: %m");
}
static int kbdctx_locale_props_changed_fn(sd_bus *bus,
}
static int kbdctx_locale_props_changed_fn(sd_bus *bus,
@@
-477,8
+476,7
@@
static int kbdctx_locale_props_changed_fn(sd_bus *bus,
return 0;
error:
return 0;
error:
- log_debug_errno(r, "idev-keyboard: cannot handle PropertiesChanged from locale1: %m");
- return r;
+ return log_debug_errno(r, "idev-keyboard: cannot handle PropertiesChanged from locale1: %m");
}
static int kbdctx_setup_bus(kbdctx *kc) {
}
static int kbdctx_setup_bus(kbdctx *kc) {
@@
-493,10
+491,8
@@
static int kbdctx_setup_bus(kbdctx *kc) {
"path='/org/freedesktop/locale1'",
kbdctx_locale_props_changed_fn,
kc);
"path='/org/freedesktop/locale1'",
kbdctx_locale_props_changed_fn,
kc);
- if (r < 0) {
- log_debug_errno(r, "idev-keyboard: cannot setup locale1 link: %m");
- return r;
- }
+ if (r < 0)
+ return log_debug_errno(r, "idev-keyboard: cannot setup locale1 link: %m");
return kbdctx_query_locale(kc);
}
return kbdctx_query_locale(kc);
}
@@
-635,7
+631,7
@@
idev_device *idev_find_keyboard(idev_session *s, const char *name) {
assert_return(s, NULL);
assert_return(name, NULL);
assert_return(s, NULL);
assert_return(name, NULL);
- kname = str
append
a("keyboard/", name);
+ kname = str
join
a("keyboard/", name);
return hashmap_get(s->device_map, kname);
}
return hashmap_get(s->device_map, kname);
}
@@
-797,7
+793,7
@@
int idev_keyboard_new(idev_device **out, idev_session *s, const char *name) {
if (r < 0)
return r;
if (r < 0)
return r;
- kname = str
append
a("keyboard/", name);
+ kname = str
join
a("keyboard/", name);
r = idev_device_add(d, kname);
if (r < 0)
return r;
r = idev_device_add(d, kname);
if (r < 0)
return r;
@@
-1125,9
+1121,8
@@
static int keyboard_update_kbdmap(idev_keyboard *k) {
return 0;
error:
return 0;
error:
- log_debug_errno(r, "idev-keyboard: %s/%s: cannot adopt new keymap: %m",
- d->session->name, d->name);
- return r;
+ return log_debug_errno(r, "idev-keyboard: %s/%s: cannot adopt new keymap: %m",
+ d->session->name, d->name);
}
static int keyboard_update_kbdtbl(idev_keyboard *k) {
}
static int keyboard_update_kbdtbl(idev_keyboard *k) {