diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-04-11 17:28:25 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-04-26 12:59:13 +0200 |
| commit | 4084669c7f802c9745bcb6bed77bdaf49ffd896d (patch) | |
| tree | c1fb17e0f34eeaa56863c920afcb463102f99a8d /src/basic | |
| parent | 6053df4ee3a205f25b67f43ece1ff4d1202b7edb (diff) | |
Prep v228: Condense elogind source masks (5/5)
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/cgroup-util.c | 3 | ||||
| -rw-r--r-- | src/basic/fileio.c | 3 | ||||
| -rw-r--r-- | src/basic/log.c | 15 | ||||
| -rw-r--r-- | src/basic/log.h | 3 | ||||
| -rw-r--r-- | src/basic/selinux-util.c | 3 |
5 files changed, 9 insertions, 18 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 6b7b9f7d8..85bbc6703 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -1173,8 +1173,7 @@ int cg_mangle_path(const char *path, char **result) { } int cg_get_root_path(char **path) { -/// elogind does not support systemd scopes and slices -#if 0 +#if 0 /// elogind does not support systemd scopes and slices char *p, *e; int r; diff --git a/src/basic/fileio.c b/src/basic/fileio.c index 388bc1825..cd2c361e3 100644 --- a/src/basic/fileio.c +++ b/src/basic/fileio.c @@ -691,8 +691,7 @@ int load_env_file(FILE *f, const char *fname, const char *newline, char ***rl) { return 0; } -/// UNNEDED by elogind -#if 0 +#if 0 /// UNNEDED by elogind static int load_env_file_push_pairs( const char *filename, unsigned line, const char *key, char *value, diff --git a/src/basic/log.c b/src/basic/log.c index c957fa2f1..f928a9d5b 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -244,8 +244,7 @@ int log_open(void) { getpid() == 1 || isatty(STDERR_FILENO) <= 0) { -/// elogind does not support logging to systemd-journald -#if 0 +#if 0 /// elogind does not support logging to systemd-journald if (log_target == LOG_TARGET_AUTO || log_target == LOG_TARGET_JOURNAL_OR_KMSG || log_target == LOG_TARGET_JOURNAL) { @@ -292,8 +291,7 @@ void log_set_target(LogTarget target) { assert(target >= 0); assert(target < _LOG_TARGET_MAX); -/// elogind does not support logging to systemd-journald -#if 0 +#if 0 /// elogind does not support logging to systemd-journald if (upgrade_syslog_to_journal) { if (target == LOG_TARGET_SYSLOG) target = LOG_TARGET_JOURNAL; @@ -591,8 +589,7 @@ static int log_dispatch( if ((e = strpbrk(buffer, NEWLINE))) *(e++) = 0; -/// elogind does not support logging to systemd-journald -#if 0 +#if 0 /// elogind does not support logging to systemd-journald if (log_target == LOG_TARGET_AUTO || log_target == LOG_TARGET_JOURNAL_OR_KMSG || log_target == LOG_TARGET_JOURNAL) { @@ -837,8 +834,7 @@ int log_struct_internal( if ((level & LOG_FACMASK) == 0) level = log_facility | LOG_PRI(level); -/// elogind does not support logging to systemd-journald -#if 0 +#if 0 /// elogind does not support logging to systemd-journald if ((log_target == LOG_TARGET_AUTO || log_target == LOG_TARGET_JOURNAL_OR_KMSG || log_target == LOG_TARGET_JOURNAL) && @@ -1077,8 +1073,7 @@ static const char *const log_target_table[_LOG_TARGET_MAX] = { [LOG_TARGET_CONSOLE] = "console", [LOG_TARGET_CONSOLE_PREFIXED] = "console-prefixed", [LOG_TARGET_KMSG] = "kmsg", -/// elogind does not support logging to systemd-journald -#if 0 +#if 0 /// elogind does not support logging to systemd-journald [LOG_TARGET_JOURNAL] = "journal", [LOG_TARGET_JOURNAL_OR_KMSG] = "journal-or-kmsg", #endif // 0 diff --git a/src/basic/log.h b/src/basic/log.h index 1201022dd..0a7acb98e 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -36,8 +36,7 @@ typedef enum LogTarget{ LOG_TARGET_CONSOLE, LOG_TARGET_CONSOLE_PREFIXED, LOG_TARGET_KMSG, -/// elogind does not support logging to systemd-journald -#if 0 +#if 0 /// elogind does not support logging to systemd-journald LOG_TARGET_JOURNAL, LOG_TARGET_JOURNAL_OR_KMSG, #endif // 0 diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c index 96f57eafb..044d4ee9f 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -173,8 +173,7 @@ int mac_selinux_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { return 0; } -/// UNNEDED by elogind -#if 0 +#if 0 /// UNNEDED by elogind int mac_selinux_apply(const char *path, const char *label) { #ifdef HAVE_SELINUX |