diff options
| author | Mark Hindley <mark@hindley.org.uk> | 2018-11-12 09:10:28 +0000 |
|---|---|---|
| committer | Mark Hindley <mark@hindley.org.uk> | 2018-11-12 09:21:21 +0000 |
| commit | 2cc17d30309a1db16cccbf376a59ae40e47b6959 (patch) | |
| tree | cd51ee95799631af348ebae8630a69219bee99cd /src/basic/unit-name.h | |
| parent | ae65e91a5439f395e0da0cd8ffda95d6289849e1 (diff) | |
| parent | d4a3f291e3955648ea1d29e674b0f8f9b1556257 (diff) | |
Merge remote-tracking branch 'upstream/v239-stable' into merge_upstream.
Diffstat (limited to 'src/basic/unit-name.h')
| -rw-r--r-- | src/basic/unit-name.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h index a9a2923fd..d625df0f9 100644 --- a/src/basic/unit-name.h +++ b/src/basic/unit-name.h @@ -8,8 +8,6 @@ #define UNIT_NAME_MAX 256 -#if 0 /// UNNEEDED by elogind -#endif // 0 typedef enum UnitNameFlags { UNIT_NAME_PLAIN = 1, /* Allow foo.service */ UNIT_NAME_INSTANCE = 2, /* Allow foo@bar.service */ @@ -20,9 +18,9 @@ typedef enum UnitNameFlags { bool unit_name_is_valid(const char *n, UnitNameFlags flags) _pure_; bool unit_prefix_is_valid(const char *p) _pure_; bool unit_instance_is_valid(const char *i) _pure_; +#if 0 /// UNNEEDED by elogind bool unit_suffix_is_valid(const char *s) _pure_; -#if 0 /// UNNEEDED by elogind static inline int unit_prefix_and_instance_is_valid(const char *p) { /* For prefix+instance and instance the same rules apply */ return unit_instance_is_valid(p); @@ -31,11 +29,9 @@ static inline int unit_prefix_and_instance_is_valid(const char *p) { int unit_name_to_prefix(const char *n, char **prefix); int unit_name_to_instance(const char *n, char **instance); int unit_name_to_prefix_and_instance(const char *n, char **ret); -#endif // 0 UnitType unit_name_to_type(const char *n) _pure_; -#if 0 /// UNNEEDED by elogind int unit_name_change_suffix(const char *n, const char *suffix, char **ret); #endif // 0 |