Prep v228: Condense elogind source masks (2/5)

diff --git a/src/basic/label.h b/src/basic/label.h
index 35feb7c8d75cec02767254ed296a034b5eca9405..cff97476ea19eef16166e316b95fcc59a6e4cce4 100644 (file)
--- a/src/basic/label.h
+++ b/src/basic/label.h
@@ -27,7 +27,6 @@
 int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs);
 
 int mkdir_label(const char *path, mode_t mode);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int symlink_label(const char *old_path, const char *new_path);
 #endif // 0

diff --git a/src/basic/log.c b/src/basic/log.c
index fa21c60e6de20260116a527bc7e3007f606fdece..c957fa2f1889b971b6cedaa0e94e4c17f445709e 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -188,8 +188,7 @@ fail:
         return r;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void log_close_journal(void) {
         journal_fd = safe_close(journal_fd);
 }
@@ -313,8 +312,7 @@ void log_close(void) {
         log_close_console();
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void log_forget_fds(void) {
         console_fd = kmsg_fd = syslog_fd = journal_fd = -1;
 }
@@ -485,8 +483,7 @@ static int write_to_kmsg(
         return 1;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 static int log_do_header(
                 char *header,
                 size_t size,
@@ -1094,8 +1091,7 @@ static const char *const log_target_table[_LOG_TARGET_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(log_target, LogTarget);
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void log_received_signal(int level, const struct signalfd_siginfo *si) {
         if (si->ssi_pid > 0) {
                 _cleanup_free_ char *p = NULL;

diff --git a/src/basic/log.h b/src/basic/log.h
index 4325215b977229c3e062501f3d90d3f1780c7b0a..1201022ddc222396fcb1a80f8e824b7a624fddc1 100644 (file)
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -70,13 +70,11 @@ int log_get_max_level(void) _pure_;
 
 int log_open(void);
 void log_close(void);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void log_forget_fds(void);
 #endif // 0
 void log_close_syslog(void);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void log_close_journal(void);
 #endif // 0
 void log_close_kmsg(void);
@@ -220,8 +218,7 @@ LogTarget log_target_from_string(const char *s) _pure_;
 #define LOG_MESSAGE(fmt, ...) "MESSAGE=" fmt, ##__VA_ARGS__
 #define LOG_MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x)
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void log_received_signal(int level, const struct signalfd_siginfo *si);
 
 void log_set_upgrade_syslog_to_journal(bool b);

diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index a103a6fae0535601e8b3ab5db027f22c4f5b5e82..1f92b681fa27afc1c35c3aa8783c2b302826c14b 100644 (file)
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -72,8 +72,7 @@ int memfd_new(const char *name) {
         return fd;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
         void *q;
         int sealed;
@@ -111,8 +110,7 @@ int memfd_set_sealed(int fd) {
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int memfd_get_sealed(int fd) {
         int r;
 
@@ -153,8 +151,7 @@ int memfd_set_size(int fd, uint64_t sz) {
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int memfd_new_and_map(const char *name, size_t sz, void **p) {
         _cleanup_close_ int fd = -1;
         int r;

diff --git a/src/basic/memfd-util.h b/src/basic/memfd-util.h
index 8c1b24c576a1243e8611e8cd267d4f3d4dca6629..1b153f9a9bc9ffb212069f3d3e340e35727a0609 100644 (file)
--- a/src/basic/memfd-util.h
+++ b/src/basic/memfd-util.h
@@ -25,15 +25,13 @@
 #include <inttypes.h>
 
 int memfd_new(const char *name);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int memfd_new_and_map(const char *name, size_t sz, void **p);
 
 int memfd_map(int fd, uint64_t offset, size_t size, void **p);
 #endif // 0
 int memfd_set_sealed(int fd);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int memfd_get_sealed(int fd);
 
 int memfd_get_size(int fd, uint64_t *sz);

diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c
index 1483b813ebbbd8cf4eb5f1990fb264ca2291d7fd..9c277c6976fb8f881732d5d1729c1d4db063e66a 100644 (file)
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -30,8 +30,7 @@ int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid) {
         return mkdir_safe_internal(path, mode, uid, gid, mkdir_label);
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int mkdir_parents_label(const char *path, mode_t mode) {
         return mkdir_parents_internal(NULL, path, mode, mkdir_label);
 }

diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h
index 3c60e55c8676aae72be1d03895ab34e8357d06bb..bd137f244b645eb58ecf7d175729947cf3599e07 100644 (file)
--- a/src/basic/mkdir.h
+++ b/src/basic/mkdir.h
@@ -30,8 +30,7 @@ int mkdir_p(const char *path, mode_t mode);
 
 /* mandatory access control(MAC) versions */
 int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int mkdir_parents_label(const char *path, mode_t mode);
 #endif // 0
 int mkdir_p_label(const char *path, mode_t mode);

diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index ff5893d3dbde979c45973f6f1c73cdf29cbbb74d..8ae1e3108777540984d5fb2e44f249063c2d82d6 100644 (file)
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -235,8 +235,7 @@ int path_is_mount_point(const char *t, int flags) {
         return fd_is_mount_point(fd, basename(t), flags);
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int umount_recursive(const char *prefix, int flags) {
         bool again;
         int n = 0, r;

diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index ad30727fea738649c3b5cb51885d689402e0bc57..3393046fc0ef1030fae5a5fb88823868aa41cd70 100644 (file)
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -32,8 +32,7 @@
 int fd_is_mount_point(int fd, const char *filename, int flags);
 int path_is_mount_point(const char *path, int flags);
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int repeat_unmount(const char *path, int flags);
 
 int umount_recursive(const char *target, int flags);
@@ -45,8 +44,7 @@ int mount_move_root(const char *path);
 DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
 #define _cleanup_endmntent_ _cleanup_(endmntentp)
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 bool fstype_is_network(const char *fstype);
 #endif // 0
 

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index dc7fdbb87f72f79d1cedf3ef0d8a672ab0f5883b..e50355977e7d438ca80aa5ba1733146d163af128 100644 (file)
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -225,8 +225,7 @@ int parse_size(const char *t, uint64_t base, uint64_t *size) {
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int parse_range(const char *t, unsigned *lower, unsigned *upper) {
         _cleanup_free_ char *word = NULL;
         unsigned l, u;

diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index 43f23500f15de1e90d2dbc6008803f7de2575850..6706a29cc245e000c03aa1be71bb5b4516bc380a 100644 (file)
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -35,8 +35,7 @@ int parse_ifindex(const char *s, int *ret);
 
 int parse_size(const char *t, uint64_t base, uint64_t *size);
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int parse_range(const char *t, unsigned *lower, unsigned *upper);
 
 #define FORMAT_BYTES_MAX 8

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index fb23917dc6ae96da722b0b20c319f9198235ce51..84ff2f387980006f9cc964089bcb24b5206e9873 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -55,8 +55,7 @@ bool is_path(const char *p) {
         return !!strchr(p, '/');
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int path_split_and_make_absolute(const char *p, char ***ret) {
         char **l;
         int r;
@@ -118,8 +117,7 @@ int path_make_absolute_cwd(const char *p, char **ret) {
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int path_make_relative(const char *from_dir, const char *to_path, char **_r) {
         char *r, *p;
         unsigned n_parents;
@@ -447,8 +445,7 @@ bool path_equal_or_files_same(const char *a, const char *b) {
         return path_equal(a, b) || files_same(a, b) > 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 char* path_join(const char *root, const char *path, const char *rest) {
         assert(path);
 
@@ -465,8 +462,7 @@ char* path_join(const char *root, const char *path, const char *rest) {
                                NULL);
 }
 #endif // 0
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 
 int find_binary(const char *name, char **ret) {
         int last_error, r;
@@ -802,8 +798,7 @@ bool hidden_file(const char *filename) {
         return hidden_file_allow_backup(filename);
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 bool is_device_path(const char *path) {
 
         /* Returns true on paths that refer to a device, either in

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 72edda8182588e49e0e247f5ab467e913265e6f7..feb959d42971e93bd4af6982c273b031c35aad41 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -36,18 +36,15 @@
 #endif
 
 bool is_path(const char *p) _pure_;
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int path_split_and_make_absolute(const char *p, char ***ret);
 #endif // 0
 bool path_is_absolute(const char *p) _pure_;
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 char* path_make_absolute(const char *p, const char *prefix);
 #endif // 0
 int path_make_absolute_cwd(const char *p, char **ret);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int path_make_relative(const char *from_dir, const char *to_path, char **_r);
 #endif // 0
 char* path_kill_slashes(char *path);
@@ -55,8 +52,7 @@ char* path_startswith(const char *path, const char *prefix) _pure_;
 int path_compare(const char *a, const char *b) _pure_;
 bool path_equal(const char *a, const char *b) _pure_;
 bool path_equal_or_files_same(const char *a, const char *b);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 char* path_join(const char *root, const char *path, const char *rest);
 
 int path_strv_make_absolute_cwd(char **l);
@@ -64,8 +60,7 @@ int path_strv_make_absolute_cwd(char **l);
 char** path_strv_resolve(char **l, const char *prefix);
 char** path_strv_resolve_uniq(char **l, const char *prefix);
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int find_binary(const char *name, char **filename);
 
 bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update);
@@ -111,8 +106,7 @@ char *prefix_root(const char *root, const char *path);
                 _ret;                                                   \
         })
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int parse_path_argument_and_warn(const char *path, bool suppress_root, char **arg);
 #endif // 0
 
@@ -126,7 +120,6 @@ char *file_in_same_dir(const char *path, const char *filename);
 bool hidden_file_allow_backup(const char *filename);
 bool hidden_file(const char *filename) _pure_;
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 bool is_device_path(const char *path);
 #endif // 0

diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index 4a36d055e3e265584aafdcd712a72950998b0fbf..5f8fb4aa1710ed08d4ba440da5e4db758b8d1b5c 100644 (file)
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -132,8 +132,7 @@ int get_proc_cmdline_key(const char *key, char **value) {
 
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int shall_restore_state(void) {
         _cleanup_free_ char *value = NULL;
         int r;

diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h
index bccecf2903ee541fcd230fad679d6e7157ea047c..a1c87fba44cd342d05e0532d47ceb0428994634f 100644 (file)
--- a/src/basic/proc-cmdline.h
+++ b/src/basic/proc-cmdline.h
@@ -25,8 +25,7 @@ int proc_cmdline(char **ret);
 int parse_proc_cmdline(int (*parse_word)(const char *key, const char *value));
 int get_proc_cmdline_key(const char *parameter, char **value);
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int shall_restore_state(void);
 const char* runlevel_to_target(const char *rl);
 #endif // 0

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 94ca0401d097e0e22970b8957d39df081936efef..0c6a494e07931adcd70c7105c22f4d97f6cbd1a2 100644 (file)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -185,8 +185,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void rename_process(const char name[8]) {
         assert(name);
 
@@ -251,8 +250,7 @@ int is_kernel_thread(pid_t pid) {
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int get_process_capeff(pid_t pid, char **capeff) {
         const char *p;
         int r;
@@ -304,8 +302,7 @@ int get_process_exe(pid_t pid, char **name) {
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 static int get_process_id(pid_t pid, const char *field, uid_t *uid) {
         _cleanup_fclose_ FILE *f = NULL;
         char line[LINE_MAX];
@@ -537,8 +534,7 @@ void sigkill_wait(pid_t *pid) {
                 (void) wait_for_terminate(*pid, NULL);
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int kill_and_sigcont(pid_t pid, int sig) {
         int r;
 
@@ -650,8 +646,7 @@ bool is_main_thread(void) {
         return cached > 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 noreturn void freeze(void) {
 
         /* Make sure nobody waits for us on a socket anymore */

diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 8f3a3f233040be316969e7e25289d773eb804e2e..ba73b00c2f23be03ce079d89e59702145054bd25 100644 (file)
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -47,8 +47,7 @@ int get_process_comm(pid_t pid, char **name);
 int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line);
 int get_process_exe(pid_t pid, char **name);
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int get_process_uid(pid_t pid, uid_t *uid);
 int get_process_gid(pid_t pid, gid_t *gid);
 int get_process_capeff(pid_t pid, char **capeff);
@@ -64,8 +63,7 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid, bool check_exit_cod
 void sigkill_wait(pid_t *pid);
 #define _cleanup_sigkill_wait_ _cleanup_(sigkill_wait)
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int kill_and_sigcont(pid_t pid, int sig);
 
 void rename_process(const char name[8]);
@@ -80,8 +78,7 @@ bool pid_is_unwaited(pid_t pid);
 
 bool is_main_thread(void);
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 noreturn void freeze(void);
 
 bool oom_score_adjust_is_valid(int oa);
@@ -94,8 +91,7 @@ bool oom_score_adjust_is_valid(int oa);
 #define PERSONALITY_INVALID 0xffffffffLU
 #endif
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 unsigned long personality_from_string(const char *p);
 const char *personality_to_string(unsigned long);
 

diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 09ee7be917c54c93da482b13a9560d1d9a844a0f..96f57eafb519e6a9f7e9cbb0fd7ac07c736eca82 100644 (file)
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -58,8 +58,7 @@ bool mac_selinux_use(void) {
 #endif
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void mac_selinux_retest(void) {
 #ifdef HAVE_SELINUX
         cached_use = -1;
@@ -113,8 +112,7 @@ int mac_selinux_init(const char *prefix) {
         return r;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void mac_selinux_finish(void) {
 
 #ifdef HAVE_SELINUX
@@ -376,8 +374,7 @@ void mac_selinux_create_file_clear(void) {
 #endif
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int mac_selinux_create_socket_prepare(const char *label) {
 
 #ifdef HAVE_SELINUX

diff --git a/src/basic/selinux-util.h b/src/basic/selinux-util.h
index 6719a7a936dfac7d7dbe01f0561e91c268f3989c..1f430a913fd9f8645d3162e244e6e2d4d292b7b3 100644 (file)
--- a/src/basic/selinux-util.h
+++ b/src/basic/selinux-util.h
@@ -27,20 +27,17 @@
 #include "macro.h"
 
 bool mac_selinux_use(void);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void mac_selinux_retest(void);
 #endif // 0
 
 int mac_selinux_init(const char *prefix);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void mac_selinux_finish(void);
 #endif // 0
 
 int mac_selinux_fix(const char *path, bool ignore_enoent, bool ignore_erofs);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int mac_selinux_apply(const char *path, const char *label);
 
 int mac_selinux_get_create_label_from_exe(const char *exe, char **label);
@@ -51,8 +48,7 @@ void mac_selinux_free(char *label);
 
 int mac_selinux_create_file_prepare(const char *path, mode_t mode);
 void mac_selinux_create_file_clear(void);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int mac_selinux_create_socket_prepare(const char *label);
 void mac_selinux_create_socket_clear(void);
 

diff --git a/src/basic/set.h b/src/basic/set.h
index ae02f4fe2aaadc972551b8630f7f24e0f3fd8060..88a2cd74a6a09325996dd0a0623699d2ab7fccf6 100644 (file)
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -65,8 +65,7 @@ static inline void *set_remove(Set *s, const void *key) {
 
 /* no set_remove2 */
 /* no set_remove_value */
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int set_remove_and_put(Set *s, const void *old_key, const void *new_key);
 #endif // 0
 /* no set_remove_and_replace */
@@ -127,8 +126,7 @@ static inline char **set_get_strv(Set *s) {
 
 int set_consume(Set *s, void *value);
 int set_put_strdup(Set *s, const char *p);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int set_put_strdupv(Set *s, char **l);
 #endif // 0
 

diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index b0ff4a6b761e57af5638dabcf6d5d00028c06b29..ee4c7efdf0d2c9ce4d5d90ef34b37348d42d324e 100644 (file)
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -87,8 +87,7 @@ static int sigaction_many_ap(const struct sigaction *sa, int sig, va_list ap) {
         return r;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int sigaction_many(const struct sigaction *sa, ...) {
         va_list ap;
         int r;
@@ -118,8 +117,7 @@ int ignore_signals(int sig, ...) {
         return r;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int default_signals(int sig, ...) {
 
         static const struct sigaction sa = {
@@ -276,8 +274,7 @@ int signal_from_string_try_harder(const char *s) {
         return signo;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void nop_signal_handler(int sig) {
         /* nothing here */
 }

diff --git a/src/basic/signal-util.h b/src/basic/signal-util.h
index b746e5cb896561c2c2e0f6fbb520a7e0d43e1cee..1cdd984a7f4c7fc62cbffab4938c910fed3587e2 100644 (file)
--- a/src/basic/signal-util.h
+++ b/src/basic/signal-util.h
@@ -29,8 +29,7 @@ int reset_all_signal_handlers(void);
 int reset_signal_mask(void);
 
 int ignore_signals(int sig, ...);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int default_signals(int sig, ...);
 int sigaction_many(const struct sigaction *sa, ...);
 #endif // 0
@@ -42,7 +41,6 @@ const char *signal_to_string(int i) _const_;
 int signal_from_string(const char *s) _pure_;
 
 int signal_from_string_try_harder(const char *s);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 void nop_signal_handler(int sig);
 #endif // 0

diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
index a8f29acfa34ce132f1f5edc4d36275b08abb1ca4..3845ab907fc3d4d49fcbc6b992e08a1eff0c163e 100644 (file)
--- a/src/basic/smack-util.c
+++ b/src/basic/smack-util.c
@@ -42,8 +42,7 @@ bool mac_smack_use(void) {
         return cached_use;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 static const char* const smack_attr_table[_SMACK_ATTR_MAX] = {
         [SMACK_ATTR_ACCESS]     = "security.SMACK64",
         [SMACK_ATTR_EXEC]       = "security.SMACK64EXEC",
@@ -188,8 +187,7 @@ int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         return r;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int mac_smack_copy(const char *dest, const char *src) {
         int r = 0;
         _cleanup_free_ char *label = NULL;
@@ -214,8 +212,7 @@ bool mac_smack_use(void) {
         return false;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int mac_smack_read(const char *path, SmackAttr attr, char **label) {
         return -EOPNOTSUPP;
 }
@@ -241,8 +238,7 @@ int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int mac_smack_copy(const char *dest, const char *src) {
         return 0;
 }