diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-28 11:28:10 -0500 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-28 11:54:37 -0500 |
commit | 5e03c6e3b517286bbd65b48d88f60e5b83721894 (patch) | |
tree | 02e4a3ebbf5f94b7f6cd2bf3f76886b65f5fa542 /src/shared/unit-name.h | |
parent | 6872b0ddc4b748ba2dbe7e74e3bbde46d17a2656 (diff) |
systemctl: append default suffix only if none present
Simplify unit_name_mangle() and unit_name_mangle_with_suffix() to
always behave the same, and only append a suffix if there is no
type suffix. If a user says 'isolate blah.device' it is better to
return an error that the type cannot be isolated, than to try to
isolate blah.device.target.
Diffstat (limited to 'src/shared/unit-name.h')
-rw-r--r-- | src/shared/unit-name.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/shared/unit-name.h b/src/shared/unit-name.h index daeb56a860..6f139cc4c4 100644 --- a/src/shared/unit-name.h +++ b/src/shared/unit-name.h @@ -156,8 +156,10 @@ enum unit_name_mangle { MANGLE_GLOB, }; -char *unit_name_mangle(const char *name, enum unit_name_mangle allow_globs); char *unit_name_mangle_with_suffix(const char *name, enum unit_name_mangle allow_globs, const char *suffix); +static inline char *unit_name_mangle(const char *name, enum unit_name_mangle allow_globs) { + return unit_name_mangle_with_suffix(name, allow_globs, ".service"); +} int build_subslice(const char *slice, const char*name, char **subslice); |