diff options
Diffstat (limited to 'src/basic')
-rw-r--r-- | src/basic/capability-util.c | 2 | ||||
-rw-r--r-- | src/basic/cgroup-util.c | 2 | ||||
-rw-r--r-- | src/basic/fileio.c | 1 | ||||
-rw-r--r-- | src/basic/fileio.h | 6 | ||||
-rw-r--r-- | src/basic/stat-util.c | 2 | ||||
-rw-r--r-- | src/basic/stat-util.h | 2 | ||||
-rw-r--r-- | src/basic/terminal-util.c | 1 | ||||
-rw-r--r-- | src/basic/time-util.c | 2 | ||||
-rw-r--r-- | src/basic/util.c | 2 | ||||
-rw-r--r-- | src/basic/util.h | 6 |
10 files changed, 15 insertions, 11 deletions
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c index 9900eafd5..294dcc8d4 100644 --- a/src/basic/capability-util.c +++ b/src/basic/capability-util.c @@ -372,7 +372,6 @@ int drop_capability(cap_value_t cv) { return 0; } -#endif // 0 bool ambient_capabilities_supported(void) { static int cache = -1; @@ -388,3 +387,4 @@ bool ambient_capabilities_supported(void) { return cache; } +#endif // 0 diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 7c8f5e29f..e11f58d13 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -1004,7 +1004,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi int cg_pid_get_path(const char *controller, pid_t pid, char **path) { _cleanup_fclose_ FILE *f = NULL; char line[LINE_MAX]; - const char *fs, *controller_str; + const char *fs, *controller_str = NULL; size_t cs = 0; int unified; diff --git a/src/basic/fileio.c b/src/basic/fileio.c index 60b34f125..196d6204d 100644 --- a/src/basic/fileio.c +++ b/src/basic/fileio.c @@ -30,6 +30,7 @@ #include "alloc-util.h" #include "ctype.h" +#include "def.h" #include "escape.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/basic/fileio.h b/src/basic/fileio.h index 5b3d045e0..2ff3b434d 100644 --- a/src/basic/fileio.h +++ b/src/basic/fileio.h @@ -36,9 +36,9 @@ typedef enum { WRITE_STRING_FILE_SYNC = 1<<4, } WriteStringFileFlags; -int write_string_stream_ts(FILE *f, const char *line, WriteStringFileFlags flags, struct timespec *ts); -static inline int write_string_stream(FILE *f, const char *line, WriteStringFileFlags flags) { - return write_string_stream_ts(f, line, flags, NULL); +int write_string_stream_ts(FILE *f, const char *line, bool enforce_newline, struct timespec *ts); +static inline int write_string_stream(FILE *f, const char *line, bool enforce_newline) { + return write_string_stream_ts(f, line, enforce_newline, NULL); } int write_string_file_ts(const char *fn, const char *line, WriteStringFileFlags flags, struct timespec *ts); static inline int write_string_file(const char *fn, const char *line, WriteStringFileFlags flags) { diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c index 0280afeec..064f0b477 100644 --- a/src/basic/stat-util.c +++ b/src/basic/stat-util.c @@ -199,7 +199,6 @@ bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) { return F_TYPE_EQUAL(s->f_type, magic_value); } -#if 0 /// UNNEEDED by elogind int fd_check_fstype(int fd, statfs_f_type_t magic_value) { struct statfs s; @@ -209,6 +208,7 @@ int fd_check_fstype(int fd, statfs_f_type_t magic_value) { return is_fs_type(&s, magic_value); } +#if 0 /// UNNEEDED by elogind int path_check_fstype(const char *path, statfs_f_type_t magic_value) { _cleanup_close_ int fd = -1; diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h index c74d1d58e..5a57f013c 100644 --- a/src/basic/stat-util.h +++ b/src/basic/stat-util.h @@ -64,8 +64,8 @@ int files_same(const char *filea, const char *fileb, int flags); typedef typeof(((struct statfs*)NULL)->f_type) statfs_f_type_t; bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) _pure_; -#if 0 /// UNNEEDED by elogind int fd_check_fstype(int fd, statfs_f_type_t magic_value); +#if 0 /// UNNEEDED by elogind int path_check_fstype(const char *path, statfs_f_type_t magic_value); #endif // 0 diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 6de772117..d580c6dac 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -47,6 +47,7 @@ #include "log.h" #include "macro.h" #include "parse-util.h" +#include "path-util.h" #include "process-util.h" #include "socket-util.h" #include "stat-util.h" diff --git a/src/basic/time-util.c b/src/basic/time-util.c index f984f46b5..fc94c945e 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -888,7 +888,6 @@ finish: return 0; } -#endif // 0 typedef struct ParseTimestampResult { usec_t usec; @@ -958,6 +957,7 @@ int parse_timestamp(const char *t, usec_t *usec) { return tmp.return_value; } +#endif // 0 static char* extract_multiplier(char *p, usec_t *multiplier) { static const struct { diff --git a/src/basic/util.c b/src/basic/util.c index 1d41a458b..463f6fd12 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -729,6 +729,7 @@ int version(void) { return 0; } +#if 0 /// UNNEEDED by elogind int get_block_device(const char *path, dev_t *dev) { struct stat st; struct statfs sfs; @@ -858,3 +859,4 @@ fallback: *dev = dt; return 1; } +#endif // 0 diff --git a/src/basic/util.h b/src/basic/util.h index aa712d9d7..aa2830dcc 100644 --- a/src/basic/util.h +++ b/src/basic/util.h @@ -188,8 +188,6 @@ static inline unsigned log2u_round_up(unsigned x) { return log2u(x - 1) + 1; } -#if 0 /// UNNEEDED by elogind -#endif // 0 int container_get_leader(const char *machine, pid_t *pid); int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *userns_fd, int *root_fd); @@ -202,10 +200,12 @@ uint64_t system_tasks_max(void); uint64_t system_tasks_max_scale(uint64_t v, uint64_t max); #if 0 /// UNNEEDED by elogind -#endif // 0 int update_reboot_parameter_and_warn(const char *param); +#endif // 0 int version(void); +#if 0 /// UNNEEDED by elogind int get_block_device(const char *path, dev_t *dev); int get_block_device_harder(const char *path, dev_t *dev); +#endif // 0 |