diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-07-09 11:40:19 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-07-19 16:51:14 +0200 |
commit | b47aa73a9a4a300e474bf960b033ef6e3df26b31 (patch) | |
tree | 83f345bcce153058e6809341514ec3d32cb49f06 /src/basic/path-util.h | |
parent | 96cf3ec96651939e9a5d48547854cb64b166544c (diff) | |
download | systemd-b47aa73a9a4a300e474bf960b033ef6e3df26b31.tar.gz |
basic/path-util: move two path_simplify* functions to be adjacent
No functional change.
Diffstat (limited to 'src/basic/path-util.h')
-rw-r--r-- | src/basic/path-util.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/basic/path-util.h b/src/basic/path-util.h index 9d0bca3ef4..1f46cd65c9 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -54,6 +54,14 @@ char* path_join_internal(const char *first, ...); char* path_simplify(char *path, bool kill_dots); +enum { + PATH_CHECK_FATAL = 1 << 0, /* If not set, then error message is appended with 'ignoring'. */ + PATH_CHECK_ABSOLUTE = 1 << 1, + PATH_CHECK_RELATIVE = 1 << 2, +}; + +int path_simplify_and_warn(char *path, unsigned flag, const char *unit, const char *filename, unsigned line, const char *lvalue); + static inline bool path_equal_ptr(const char *a, const char *b) { return !!a == !!b && (!a || path_equal(a, b)); } @@ -169,11 +177,3 @@ bool empty_or_root(const char *root); static inline const char *empty_to_root(const char *path) { return isempty(path) ? "/" : path; } - -enum { - PATH_CHECK_FATAL = 1 << 0, /* If not set, then error message is appended with 'ignoring'. */ - PATH_CHECK_ABSOLUTE = 1 << 1, - PATH_CHECK_RELATIVE = 1 << 2, -}; - -int path_simplify_and_warn(char *path, unsigned flag, const char *unit, const char *filename, unsigned line, const char *lvalue); |