chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: add .busname unit type to implement kdbus-style bus activation
[elogind.git]
/
src
/
shared
/
unit-name.c
diff --git
a/src/shared/unit-name.c
b/src/shared/unit-name.c
index 2335463777e7a1c2a1e09e6e6daa0020882cbfc3..178efefdbfe147fdd5f9411bc458d87391b7b680 100644
(file)
--- a/
src/shared/unit-name.c
+++ b/
src/shared/unit-name.c
@@
-36,13
+36,14
@@
static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = "service",
[UNIT_SOCKET] = "socket",
static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = "service",
[UNIT_SOCKET] = "socket",
+ [UNIT_BUSNAME] = "busname",
[UNIT_TARGET] = "target",
[UNIT_TARGET] = "target",
+ [UNIT_SNAPSHOT] = "snapshot",
[UNIT_DEVICE] = "device",
[UNIT_MOUNT] = "mount",
[UNIT_AUTOMOUNT] = "automount",
[UNIT_DEVICE] = "device",
[UNIT_MOUNT] = "mount",
[UNIT_AUTOMOUNT] = "automount",
- [UNIT_SNAPSHOT] = "snapshot",
- [UNIT_TIMER] = "timer",
[UNIT_SWAP] = "swap",
[UNIT_SWAP] = "swap",
+ [UNIT_TIMER] = "timer",
[UNIT_PATH] = "path",
[UNIT_SLICE] = "slice",
[UNIT_SCOPE] = "scope"
[UNIT_PATH] = "path",
[UNIT_SLICE] = "slice",
[UNIT_SCOPE] = "scope"
@@
-441,7
+442,7
@@
char *unit_name_from_path_instance(const char *prefix, const char *path, const c
}
char *unit_name_to_path(const char *name) {
}
char *unit_name_to_path(const char *name) {
-
char *w, *e
;
+
_cleanup_free_ char *w = NULL
;
assert(name);
assert(name);
@@
-449,10
+450,7
@@
char *unit_name_to_path(const char *name) {
if (!w)
return NULL;
if (!w)
return NULL;
- e = unit_name_path_unescape(w);
- free(w);
-
- return e;
+ return unit_name_path_unescape(w);
}
char *unit_dbus_path_from_name(const char *name) {
}
char *unit_dbus_path_from_name(const char *name) {