Prep v227: Clean up various *-util.[hc] files

- src/basic/cgroup-util.[hc]
- src/basic/memfd-util.[hc]
- src/basic/path-util.[hc]
- src/basic/process-util.[hc]
- src/basic/smack-util.[hc]

diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index c70afddfd5abde15c5d118f1a008b26ada2c1d52..7b2276bf65caea91838c6f05a2e38e6c0e11426d 100644 (file)
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -4,6 +4,7 @@
        <Project>
                <Option title="elogind" />
                <Option makefile_is_custom="1" />
+               <Option execution_dir="../../elogind" />
                <Option pch_mode="2" />
                <Option compiler="gcc" />
                <Build>

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index a0a61d8874c79c0d0d1d5430633503afa21d4ec6..502fe460903ca5098daa744e2308fc45f32ef41d 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2281,6 +2281,8 @@ bool cg_is_legacy_wanted(void) {
 }
 #endif // 0
 
+/// UNNEEDED by elogind
+#if 0
 int cg_cpu_shares_parse(const char *s, uint64_t *ret) {
         uint64_t u;
         int r;
@@ -2319,7 +2321,8 @@ int cg_blkio_weight_parse(const char *s, uint64_t *ret) {
 
         *ret = u;
         return 0;
- }
+}
+#endif // 0
 
 static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {
         [CGROUP_CONTROLLER_CPU] = "cpu",

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 820d07985fb7ca070bd77c48254983085751835e..e3f3bf080c422be242047a26b9220df01e97810a 100644 (file)
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -188,5 +188,5 @@ bool cg_is_legacy_wanted(void);
 const char* cgroup_controller_to_string(CGroupController c) _const_;
 CGroupController cgroup_controller_from_string(const char *s) _pure_;
 
-int cg_cpu_shares_parse(const char *s, uint64_t *ret);
-int cg_blkio_weight_parse(const char *s, uint64_t *ret);
+// UNNEEDED int cg_cpu_shares_parse(const char *s, uint64_t *ret);
+// UNNEEDED int cg_blkio_weight_parse(const char *s, uint64_t *ret);

diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index b6dc19082864c647189c5181fa52df99bbedbe81..fef163457e4fd24d45a28f8ea3153f6a55540eb9 100644 (file)
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -70,6 +70,8 @@ int memfd_new(const char *name) {
         return fd;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
         void *q;
         int sealed;
@@ -93,6 +95,7 @@ int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
         *p = q;
         return 0;
 }
+#endif // 0
 
 int memfd_set_sealed(int fd) {
         int r;
@@ -118,6 +121,8 @@ int memfd_get_sealed(int fd) {
         return r == (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE | F_SEAL_SEAL);
 }
 
+/// UNNEEDED by elogind
+#if 0
 int memfd_get_size(int fd, uint64_t *sz) {
         struct stat stat;
         int r;
@@ -132,6 +137,7 @@ int memfd_get_size(int fd, uint64_t *sz) {
         *sz = stat.st_size;
         return 0;
 }
+#endif // 0
 
 int memfd_set_size(int fd, uint64_t sz) {
         int r;

diff --git a/src/basic/memfd-util.h b/src/basic/memfd-util.h
index 9aa87b783cce2ac913543bf129b77602358776e5..d96fd160e95abd2b2acd8a72f64e6b3734aff016 100644 (file)
--- a/src/basic/memfd-util.h
+++ b/src/basic/memfd-util.h
@@ -26,10 +26,10 @@
 int memfd_new(const char *name);
 // UNNEEDED 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);
+// UNNEEDED int memfd_map(int fd, uint64_t offset, size_t size, void **p);
 
 int memfd_set_sealed(int fd);
 int memfd_get_sealed(int fd);
 
-int memfd_get_size(int fd, uint64_t *sz);
+// UNNEEDED int memfd_get_size(int fd, uint64_t *sz);
 int memfd_set_size(int fd, uint64_t sz);

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 238252eebfb2f228100a8ec432ff8881ed81196e..3998fc98a8f87b5d77b1da917a6154369ec03a15 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -219,7 +219,6 @@ int path_make_relative(const char *from_dir, const char *to_path, char **_r) {
         *_r = r;
         return 0;
 }
-#endif // 0
 
 char **path_strv_make_absolute_cwd(char **l) {
         char **s;
@@ -241,6 +240,7 @@ char **path_strv_make_absolute_cwd(char **l) {
 
         return l;
 }
+#endif // 0
 
 char **path_strv_resolve(char **l, const char *prefix) {
         char **s;

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 90b405dc84ba2cffab83855cb0ec7fde7e58652d..a0a8dc6191066ebb9d31e9c6f661fb6680b0781d 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -49,7 +49,7 @@ bool path_equal(const char *a, const char *b) _pure_;
 // UNNEEDED bool path_equal_or_files_same(const char *a, const char *b);
 // UNNEEDED char* path_join(const char *root, const char *path, const char *rest);
 
-char** path_strv_make_absolute_cwd(char **l);
+// UNNEEDED char** 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);
 

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 25044dfaa7bc916bb4768307c082d1fa337d691f..8a1f54db81b61fd6949401cb81b389e4b9942b54 100644 (file)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -368,7 +368,6 @@ int get_process_environ(pid_t pid, char **env) {
 
         return 0;
 }
-#endif // 0
 
 int get_parent_of_pid(pid_t pid, pid_t *_ppid) {
         int r;
@@ -414,6 +413,7 @@ int get_parent_of_pid(pid_t pid, pid_t *_ppid) {
 
         return 0;
 }
+#endif // 0
 
 int wait_for_terminate(pid_t pid, siginfo_t *status) {
         siginfo_t dummy;

diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 1482cca34a7cd6595a7a53bd83eb7bcfa4475803..8e0b589758fd470a95a1948b61e063b405bb7257 100644 (file)
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -56,7 +56,7 @@ int wait_for_terminate(pid_t pid, siginfo_t *status);
 int wait_for_terminate_and_warn(const char *name, pid_t pid, bool check_exit_code);
 
 // UNNEEDED int kill_and_sigcont(pid_t pid, int sig);
-pid_t get_parent_of_pid(pid_t pid, pid_t *ppid);
+// UNNEEDED pid_t get_parent_of_pid(pid_t pid, pid_t *ppid);
 // UNNEEDED void rename_process(const char name[8]);
 int is_kernel_thread(pid_t pid);
 int getenv_for_pid(pid_t pid, const char *field, char **_value);

diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
index 5f570ff02ae11c27fa620f05ab519230d86c6296..a5fd687b82fbfb3fe2dbc91d36e65d76d69fa2bf 100644 (file)
--- a/src/basic/smack-util.c
+++ b/src/basic/smack-util.c
@@ -39,6 +39,8 @@ bool mac_smack_use(void) {
         return cached_use;
 }
 
+/// UNNEEDED by elogind
+#if 0
 static const char* const smack_attr_table[_SMACK_ATTR_MAX] = {
         [SMACK_ATTR_ACCESS]     = "security.SMACK64",
         [SMACK_ATTR_EXEC]       = "security.SMACK64EXEC",
@@ -126,6 +128,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
 
         return r;
 }
+#endif // 0
 
 int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         struct stat st;
@@ -182,6 +185,8 @@ int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         return r;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int mac_smack_copy(const char *dest, const char *src) {
         int r = 0;
         _cleanup_free_ char *label = NULL;
@@ -199,12 +204,15 @@ int mac_smack_copy(const char *dest, const char *src) {
 
         return r;
 }
+#endif // 0
 
 #else
 bool mac_smack_use(void) {
         return false;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int mac_smack_read(const char *path, SmackAttr attr, char **label) {
         return -EOPNOTSUPP;
 }
@@ -224,12 +232,16 @@ int mac_smack_apply_fd(int fd, SmackAttr attr, const char *label) {
 int mac_smack_apply_pid(pid_t pid, const char *label) {
         return 0;
 }
+#endif // 0
 
 int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         return 0;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int mac_smack_copy(const char *dest, const char *src) {
         return 0;
 }
+#endif // 0
 #endif

diff --git a/src/basic/smack-util.h b/src/basic/smack-util.h
index e756dc8c2896f7f0bd06453b95f9f52c8289b7ce..327a07821111414fb829ac728ce30cd768a2c423 100644 (file)
--- a/src/basic/smack-util.h
+++ b/src/basic/smack-util.h
@@ -30,6 +30,8 @@
 #define SMACK_FLOOR_LABEL "_"
 #define SMACK_STAR_LABEL  "*"
 
+/// UNNEEDED by elogind
+#if 0
 typedef enum SmackAttr {
         SMACK_ATTR_ACCESS = 0,
         SMACK_ATTR_EXEC = 1,
@@ -40,16 +42,17 @@ typedef enum SmackAttr {
         _SMACK_ATTR_MAX,
         _SMACK_ATTR_INVALID = -1,
 } SmackAttr;
+#endif // 0
 
 bool mac_smack_use(void);
 
 int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs);
 
-const char* smack_attr_to_string(SmackAttr i) _const_;
-SmackAttr smack_attr_from_string(const char *s) _pure_;
-int mac_smack_read(const char *path, SmackAttr attr, char **label);
-int mac_smack_read_fd(int fd, SmackAttr attr, char **label);
-int mac_smack_apply(const char *path, SmackAttr attr, const char *label);
-int mac_smack_apply_fd(int fd, SmackAttr attr, const char *label);
-int mac_smack_apply_pid(pid_t pid, const char *label);
-int mac_smack_copy(const char *dest, const char *src);
+// UNNEEDED const char* smack_attr_to_string(SmackAttr i) _const_;
+// UNNEEDED SmackAttr smack_attr_from_string(const char *s) _pure_;
+// UNNEEDED int mac_smack_read(const char *path, SmackAttr attr, char **label);
+// UNNEEDED int mac_smack_read_fd(int fd, SmackAttr attr, char **label);
+// UNNEEDED int mac_smack_apply(const char *path, SmackAttr attr, const char *label);
+// UNNEEDED int mac_smack_apply_fd(int fd, SmackAttr attr, const char *label);
+// UNNEEDED int mac_smack_apply_pid(pid_t pid, const char *label);
+// UNNEEDED int mac_smack_copy(const char *dest, const char *src);