chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad31ae9
)
Prep v239: Uncomment header inclusions that are new or needed now.
author
Sven Eden
<yamakuzure@gmx.net>
Wed, 15 Aug 2018 07:01:47 +0000
(09:01 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Fri, 24 Aug 2018 14:47:08 +0000
(16:47 +0200)
25 files changed:
cb/elogind.cbp
patch
|
blob
|
history
src/basic/conf-files.c
patch
|
blob
|
history
src/basic/conf-files.h
patch
|
blob
|
history
src/basic/copy.c
patch
|
blob
|
history
src/basic/fd-util.c
patch
|
blob
|
history
src/basic/format-table.c
patch
|
blob
|
history
src/basic/mkdir.c
patch
|
blob
|
history
src/basic/parse-util.c
patch
|
blob
|
history
src/basic/process-util.c
patch
|
blob
|
history
src/basic/rm-rf.c
patch
|
blob
|
history
src/basic/smack-util.c
patch
|
blob
|
history
src/basic/smack-util.h
patch
|
blob
|
history
src/basic/string-util.c
patch
|
blob
|
history
src/libelogind/sd-event/test-event.c
patch
|
blob
|
history
src/login/loginctl.c
patch
|
blob
|
history
src/login/logind-action.h
patch
|
blob
|
history
src/login/logind-dbus.c
patch
|
blob
|
history
src/login/pam_elogind.c
patch
|
blob
|
history
src/test/test-bus-util.c
patch
|
blob
|
history
src/test/test-conf-files.c
patch
|
blob
|
history
src/test/test-conf-parser.c
patch
|
blob
|
history
src/test/test-ellipsize.c
patch
|
blob
|
history
src/test/test-parse-util.c
patch
|
blob
|
history
src/test/test-signal-util.c
patch
|
blob
|
history
src/test/test-string-util.c
patch
|
blob
|
history
diff --git
a/cb/elogind.cbp
b/cb/elogind.cbp
index 077aa055cab05ea478df32f02a126058c5dd3e21..f6c6a6667f364f65744ab0343aa84e6e4a1e77e4 100644
(file)
--- a/
cb/elogind.cbp
+++ b/
cb/elogind.cbp
@@
-392,7
+392,6
@@
<Option target="clean" />
</Unit>
<Unit filename="../src/basic/mount-util.c">
<Option target="clean" />
</Unit>
<Unit filename="../src/basic/mount-util.c">
- <Option compilerVar="CC" />
<Option target="all" />
<Option target="clean" />
</Unit>
<Option target="all" />
<Option target="clean" />
</Unit>
@@
-1246,11
+1245,6
@@
<Option target="all" />
<Option target="clean" />
</Unit>
<Option target="all" />
<Option target="clean" />
</Unit>
- <Unit filename="../src/shared/udev-util.c">
- <Option compilerVar="CC" />
- <Option target="all" />
- <Option target="clean" />
- </Unit>
<Unit filename="../src/shared/udev-util.h">
<Option target="all" />
<Option target="clean" />
<Unit filename="../src/shared/udev-util.h">
<Option target="all" />
<Option target="clean" />
diff --git
a/src/basic/conf-files.c
b/src/basic/conf-files.c
index 5801d5409bee93b22c83f9537fe90171fb3e8d90..6960a0bce37d07cbcb9cec97670575b893f30de8 100644
(file)
--- a/
src/basic/conf-files.c
+++ b/
src/basic/conf-files.c
@@
-8,7
+8,7
@@
#include <string.h>
#include "conf-files.h"
#include <string.h>
#include "conf-files.h"
-
//
#include "def.h"
+#include "def.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "hashmap.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "hashmap.h"
@@
-16,7
+16,7
@@
#include "macro.h"
#include "missing.h"
#include "path-util.h"
#include "macro.h"
#include "missing.h"
#include "path-util.h"
-
//
#include "set.h"
+#include "set.h"
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
@@
-333,6
+333,7
@@
int conf_files_list_with_replacement(
return 0;
}
return 0;
}
+#if 0 /// UNNEEDED by elogind
int conf_files_cat(const char *root, const char *name) {
_cleanup_strv_free_ char **dirs = NULL, **files = NULL;
_cleanup_free_ char *path = NULL;
int conf_files_cat(const char *root, const char *name) {
_cleanup_strv_free_ char **dirs = NULL, **files = NULL;
_cleanup_free_ char *path = NULL;
@@
-365,3
+366,4
@@
int conf_files_cat(const char *root, const char *name) {
/* show */
return cat_files(path, files, CAT_FLAGS_MAIN_FILE_OPTIONAL);
}
/* show */
return cat_files(path, files, CAT_FLAGS_MAIN_FILE_OPTIONAL);
}
+#endif // 0
diff --git
a/src/basic/conf-files.h
b/src/basic/conf-files.h
index 9da03ed228ed3dc9738e0c1d483831f70c867366..16fcc573678fe45fc878996ed30292c6d676b04e 100644
(file)
--- a/
src/basic/conf-files.h
+++ b/
src/basic/conf-files.h
@@
-21,4
+21,6
@@
int conf_files_list_with_replacement(
const char *replacement,
char ***files,
char **replace_file);
const char *replacement,
char ***files,
char **replace_file);
+#if 0 /// UNNEEDED by elogind
int conf_files_cat(const char *root, const char *name);
int conf_files_cat(const char *root, const char *name);
+#endif // 0
diff --git
a/src/basic/copy.c
b/src/basic/copy.c
index 1b1e512b83c19060a8de38d37e1d9d9f922374a3..aaefc3a5107fb3c39b16dcd3ebc735a42d2c3c4f 100644
(file)
--- a/
src/basic/copy.c
+++ b/
src/basic/copy.c
@@
-3,7
+3,7
@@
//#include <dirent.h>
//#include <errno.h>
//#include <fcntl.h>
//#include <dirent.h>
//#include <errno.h>
//#include <fcntl.h>
-
//
#include <stddef.h>
+#include <stddef.h>
//#include <stdio.h>
//#include <stdlib.h>
//#include <string.h>
//#include <stdio.h>
//#include <stdlib.h>
//#include <string.h>
diff --git
a/src/basic/fd-util.c
b/src/basic/fd-util.c
index 9ea102c0f9957ebdb403f69143c806a8588d3345..1efd83b7f6a899259c98dc16f3b73b3b3fb45ac1 100644
(file)
--- a/
src/basic/fd-util.c
+++ b/
src/basic/fd-util.c
@@
-7,8
+7,8
@@
#include <sys/stat.h>
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
-
//
#include "alloc-util.h"
-
//
#include "copy.h"
+#include "alloc-util.h"
+#include "copy.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "fileio.h"
diff --git
a/src/basic/format-table.c
b/src/basic/format-table.c
index c967642dff9131f37b25524efd2f8019f566b72b..6c079bf8d563c6fea96007da111953d77f688d07 100644
(file)
--- a/
src/basic/format-table.c
+++ b/
src/basic/format-table.c
@@
-13,7
+13,7
@@
//#include "terminal-util.h"
//#include "time-util.h"
//#include "utf8.h"
//#include "terminal-util.h"
//#include "time-util.h"
//#include "utf8.h"
-
//
#include "util.h"
+#include "util.h"
#define DEFAULT_WEIGHT 100
#define DEFAULT_WEIGHT 100
diff --git
a/src/basic/mkdir.c
b/src/basic/mkdir.c
index 29d31831e7b912f52d1c8eee3049e45a2e966e46..9e9c172f9741352eb083a911042aa751d960aaef 100644
(file)
--- a/
src/basic/mkdir.c
+++ b/
src/basic/mkdir.c
@@
-11,13
+11,12
@@
#include "mkdir.h"
#include "path-util.h"
#include "stat-util.h"
#include "mkdir.h"
#include "path-util.h"
#include "stat-util.h"
-
//
#include "stdio-util.h"
+#include "stdio-util.h"
#include "user-util.h"
/// Additional includes needed by elogind
#include "missing.h"
#include "user-util.h"
/// Additional includes needed by elogind
#include "missing.h"
-int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, bool follow_symlink, mkdir_func_t _mkdir) {
int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) {
struct stat st;
int r;
int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) {
struct stat st;
int r;
diff --git
a/src/basic/parse-util.c
b/src/basic/parse-util.c
index f33e12a74a25c480223c28527bf7258a24c6173e..3935d8a3e1abe28b5e4a8b08dc39f7dfe3bc244e 100644
(file)
--- a/
src/basic/parse-util.c
+++ b/
src/basic/parse-util.c
@@
-6,14
+6,14
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
//
#include <sys/socket.h>
+#include <sys/socket.h>
#include "alloc-util.h"
#include "errno-list.h"
//#include "extract-word.h"
#include "locale-util.h"
#include "macro.h"
#include "alloc-util.h"
#include "errno-list.h"
//#include "extract-word.h"
#include "locale-util.h"
#include "macro.h"
-
//
#include "missing.h"
+#include "missing.h"
#include "parse-util.h"
#include "process-util.h"
#include "string-util.h"
#include "parse-util.h"
#include "process-util.h"
#include "string-util.h"
diff --git
a/src/basic/process-util.c
b/src/basic/process-util.c
index 7064cc45348a5c6c074fec34d6c79fe507b41163..77d76958c0b48e05b8862ba8150093a86fda2ba2 100644
(file)
--- a/
src/basic/process-util.c
+++ b/
src/basic/process-util.c
@@
-12,7
+12,7
@@
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
-
//
#include <sys/mount.h>
+#include <sys/mount.h>
#include <sys/personality.h>
#include <sys/prctl.h>
#include <sys/types.h>
#include <sys/personality.h>
#include <sys/prctl.h>
#include <sys/types.h>
diff --git
a/src/basic/rm-rf.c
b/src/basic/rm-rf.c
index cb69abca63c48836bfec1ac705f96725c1f76fc8..1b0de8bd0244d5928171dd29b2488cd5dc912e63 100644
(file)
--- a/
src/basic/rm-rf.c
+++ b/
src/basic/rm-rf.c
@@
-8,7
+8,7
@@
#include <sys/statfs.h>
#include <unistd.h>
#include <sys/statfs.h>
#include <unistd.h>
-
//
#include "alloc-util.h"
+#include "alloc-util.h"
//#include "btrfs-util.h"
#include "cgroup-util.h"
#include "dirent-util.h"
//#include "btrfs-util.h"
#include "cgroup-util.h"
#include "dirent-util.h"
diff --git
a/src/basic/smack-util.c
b/src/basic/smack-util.c
index 2b63eee83637b3018d02e3864ed0075343f0f8ce..8c82d008ca1680e85e6c3ae4b29d9ddf23d63f05 100644
(file)
--- a/
src/basic/smack-util.c
+++ b/
src/basic/smack-util.c
@@
-6,21
+6,21
@@
***/
#include <errno.h>
***/
#include <errno.h>
-
//
#include <fcntl.h>
+#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/xattr.h>
#include <unistd.h>
#include "alloc-util.h"
#include <string.h>
#include <sys/stat.h>
#include <sys/xattr.h>
#include <unistd.h>
#include "alloc-util.h"
-
//
#include "fd-util.h"
+#include "fd-util.h"
#include "fileio.h"
#include "log.h"
#include "macro.h"
#include "path-util.h"
#include "process-util.h"
#include "smack-util.h"
#include "fileio.h"
#include "log.h"
#include "macro.h"
#include "path-util.h"
#include "process-util.h"
#include "smack-util.h"
-
//
#include "stdio-util.h"
+#include "stdio-util.h"
#include "string-table.h"
#include "xattr-util.h"
#include "string-table.h"
#include "xattr-util.h"
diff --git
a/src/basic/smack-util.h
b/src/basic/smack-util.h
index 2a9773f32a1fb06f0b5957d5b5eb79e77b165bf9..2424d479e08bb56b82ddd155b910081c48e1d573 100644
(file)
--- a/
src/basic/smack-util.h
+++ b/
src/basic/smack-util.h
@@
-10,7
+10,7
@@
#include <stdbool.h>
#include <sys/types.h>
#include <stdbool.h>
#include <sys/types.h>
-
//
#include "label.h"
+#include "label.h"
#include "macro.h"
#define SMACK_FLOOR_LABEL "_"
#include "macro.h"
#define SMACK_FLOOR_LABEL "_"
diff --git
a/src/basic/string-util.c
b/src/basic/string-util.c
index 7abbfe0c423af633949a5c992836fd7ed26ae06c..0f43b374485ea21372e2e3809cb857205bd09e23 100644
(file)
--- a/
src/basic/string-util.c
+++ b/
src/basic/string-util.c
@@
-17,7
+17,7
@@
//#include "terminal-util.h"
#include "utf8.h"
#include "util.h"
//#include "terminal-util.h"
#include "utf8.h"
#include "util.h"
-
//
#include "fileio.h"
+#include "fileio.h"
int strcmp_ptr(const char *a, const char *b) {
int strcmp_ptr(const char *a, const char *b) {
diff --git
a/src/libelogind/sd-event/test-event.c
b/src/libelogind/sd-event/test-event.c
index 2eb022362ab8248332cd090b8dd828bae6275469..13dcf6ab9b45e8664d1218de4b5174732e662a48 100644
(file)
--- a/
src/libelogind/sd-event/test-event.c
+++ b/
src/libelogind/sd-event/test-event.c
@@
-6,18
+6,18
@@
#include "sd-event.h"
#include "sd-event.h"
-
//
#include "alloc-util.h"
+#include "alloc-util.h"
#include "fd-util.h"
#include "fd-util.h"
-
//
#include "fileio.h"
-
//
#include "fs-util.h"
+#include "fileio.h"
+#include "fs-util.h"
#include "log.h"
#include "macro.h"
#include "log.h"
#include "macro.h"
-
//
#include "parse-util.h"
+#include "parse-util.h"
//#include "process-util.h"
//#include "process-util.h"
-
//
#include "rm-rf.h"
+#include "rm-rf.h"
#include "signal-util.h"
#include "signal-util.h"
-
//
#include "stdio-util.h"
-
//
#include "string-util.h"
+#include "stdio-util.h"
+#include "string-util.h"
#include "util.h"
/// Additional includes needed by elogind
#include "process-util.h"
#include "util.h"
/// Additional includes needed by elogind
#include "process-util.h"
diff --git
a/src/login/loginctl.c
b/src/login/loginctl.c
index 3553abd0d511e101832f949ce9af00f0d90d900a..9eef701b05dd96b1281c2922406a40013319bc69 100644
(file)
--- a/
src/login/loginctl.c
+++ b/
src/login/loginctl.c
@@
-14,7
+14,7
@@
#include "bus-util.h"
//#include "cgroup-show.h"
#include "cgroup-util.h"
#include "bus-util.h"
//#include "cgroup-show.h"
#include "cgroup-util.h"
-
//
#include "format-table.h"
+#include "format-table.h"
#include "log.h"
//#include "logs-show.h"
#include "macro.h"
#include "log.h"
//#include "logs-show.h"
#include "macro.h"
@@
-24,7
+24,7
@@
#include "sigbus.h"
#include "signal-util.h"
#include "spawn-polkit-agent.h"
#include "sigbus.h"
#include "signal-util.h"
#include "spawn-polkit-agent.h"
-
//
#include "string-table.h"
+#include "string-table.h"
#include "strv.h"
#include "sysfs-show.h"
#include "terminal-util.h"
#include "strv.h"
#include "sysfs-show.h"
#include "terminal-util.h"
diff --git
a/src/login/logind-action.h
b/src/login/logind-action.h
index c1421193b439e27ba42972a5ace6ff561ff6d613..a45aab7854722435279befd0f9208f5adb9c2cc2 100644
(file)
--- a/
src/login/logind-action.h
+++ b/
src/login/logind-action.h
@@
-1,7
+1,7
@@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-
//
#include "conf-parser.h"
+#include "conf-parser.h"
typedef enum HandleAction {
HANDLE_IGNORE,
typedef enum HandleAction {
HANDLE_IGNORE,
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index f9d0b1c9f57320e3dc4cc1fd7fe692408000a9b8..31acd57dc62641ae8ec123c3cd2c3ef1cc8f9d6d 100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-2338,11
+2338,11
@@
static int method_can_shutdown_or_sleep(
if (sleep_verb) {
#if 0 /// elogind needs to have the manager being passed
r = can_sleep(sleep_verb);
if (sleep_verb) {
#if 0 /// elogind needs to have the manager being passed
r = can_sleep(sleep_verb);
- if (IN_SET(r, 0, -ENOSPC))
- return sd_bus_reply_method_return(message, "s", "na");
#else
r = can_sleep(m, sleep_verb);
#endif // 0
#else
r = can_sleep(m, sleep_verb);
#endif // 0
+ if (IN_SET(r, 0, -ENOSPC))
+ return sd_bus_reply_method_return(message, "s", "na");
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-2385,6
+2385,10
@@
static int method_can_shutdown_or_sleep(
}
#endif // 0
}
}
#endif // 0
}
+#else
+ if ( (handle <= HANDLE_IGNORE) || (handle >= _HANDLE_ACTION_MAX) ) {
+ result = "no";
+ goto finish;
}
if (multiple_sessions) {
}
if (multiple_sessions) {
@@
-2430,6
+2434,7
@@
static int method_can_shutdown_or_sleep(
}
finish:
}
finish:
+
return sd_bus_reply_method_return(message, "s", result);
}
return sd_bus_reply_method_return(message, "s", result);
}
diff --git
a/src/login/pam_elogind.c
b/src/login/pam_elogind.c
index f9c5398f1d2aafafc6d14b5791be952f86fe7664..88c5705efb066663a9e6038d091251ed7281d576 100644
(file)
--- a/
src/login/pam_elogind.c
+++ b/
src/login/pam_elogind.c
@@
-30,7
+30,7
@@
#include "terminal-util.h"
#include "util.h"
#include "path-util.h"
#include "terminal-util.h"
#include "util.h"
#include "path-util.h"
-
//
#include "cgroup-util.h"
+#include "cgroup-util.h"
static int parse_argv(
pam_handle_t *handle,
static int parse_argv(
pam_handle_t *handle,
diff --git
a/src/test/test-bus-util.c
b/src/test/test-bus-util.c
index a320a0d787e4d3cf479e3e38796cf456bef45512..23cd6022604aeb59c96d23acc55b76c7dbb3c832 100644
(file)
--- a/
src/test/test-bus-util.c
+++ b/
src/test/test-bus-util.c
@@
-1,7
+1,7
@@
/* SPDX-License-Identifier: LGPL-2.1+ */
/* SPDX-License-Identifier: LGPL-2.1+ */
-
//
#include "bus-util.h"
-
//
#include "log.h"
+#include "bus-util.h"
+#include "log.h"
static void test_name_async(unsigned n_messages) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
static void test_name_async(unsigned n_messages) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
diff --git
a/src/test/test-conf-files.c
b/src/test/test-conf-files.c
index a9b78450b46101bc2f1bb13a8675dcc1e96a9b52..2ec2dfc26154c72d4815fe50f2e6394a586c5281 100644
(file)
--- a/
src/test/test-conf-files.c
+++ b/
src/test/test-conf-files.c
@@
-8,10
+8,10
@@
#include "alloc-util.h"
#include "conf-files.h"
#include "alloc-util.h"
#include "conf-files.h"
-
//
#include "fileio.h"
+#include "fileio.h"
#include "fs-util.h"
#include "macro.h"
#include "fs-util.h"
#include "macro.h"
-
//
#include "mkdir.h"
+#include "mkdir.h"
#include "parse-util.h"
#include "rm-rf.h"
#include "string-util.h"
#include "parse-util.h"
#include "rm-rf.h"
#include "string-util.h"
diff --git
a/src/test/test-conf-parser.c
b/src/test/test-conf-parser.c
index a8df45941cb387384993c724daa2c545116b1d13..3cce425e691f5453748354a0360d97c5faf60bd4 100644
(file)
--- a/
src/test/test-conf-parser.c
+++ b/
src/test/test-conf-parser.c
@@
-3,17
+3,13
@@
#include "conf-parser.h"
#include "fd-util.h"
#include "fileio.h"
#include "conf-parser.h"
#include "fd-util.h"
#include "fileio.h"
-
//
#include "fs-util.h"
+#include "fs-util.h"
#include "log.h"
#include "macro.h"
#include "string-util.h"
#include "strv.h"
#include "util.h"
#include "log.h"
#include "macro.h"
#include "string-util.h"
#include "strv.h"
#include "util.h"
-/// Additional includes needed by elogind
-#include "fd-util.h"
-#include "fileio.h"
-
static void test_config_parse_path_one(const char *rvalue, const char *expected) {
_cleanup_free_ char *path = NULL;
static void test_config_parse_path_one(const char *rvalue, const char *expected) {
_cleanup_free_ char *path = NULL;
diff --git
a/src/test/test-ellipsize.c
b/src/test/test-ellipsize.c
index 5e0c7577f9c267eed75ded8e7f6c207e21a16b16..92692bd487b80bab09ae816932333af01b611412 100644
(file)
--- a/
src/test/test-ellipsize.c
+++ b/
src/test/test-ellipsize.c
@@
-5,10
+5,10
@@
#include "alloc-util.h"
#include "def.h"
#include "string-util.h"
#include "alloc-util.h"
#include "def.h"
#include "string-util.h"
-
//
#include "strv.h"
+#include "strv.h"
#include "terminal-util.h"
#include "util.h"
#include "terminal-util.h"
#include "util.h"
-
//
#include "utf8.h"
+#include "utf8.h"
static void test_ellipsize_mem_one(const char *s, size_t old_length, size_t new_length) {
_cleanup_free_ char *n = NULL;
static void test_ellipsize_mem_one(const char *s, size_t old_length, size_t new_length) {
_cleanup_free_ char *n = NULL;
diff --git
a/src/test/test-parse-util.c
b/src/test/test-parse-util.c
index 73688952f005e733b4468fe6b41d22d906dd4357..19e1ed477ba8585db3d4ad164a433cd2c054d1ad 100644
(file)
--- a/
src/test/test-parse-util.c
+++ b/
src/test/test-parse-util.c
@@
-3,7
+3,7
@@
#include <errno.h>
#include <locale.h>
#include <math.h>
#include <errno.h>
#include <locale.h>
#include <math.h>
-
//
#include <sys/socket.h>
+#include <sys/socket.h>
#include "alloc-util.h"
#include "errno-list.h"
#include "alloc-util.h"
#include "errno-list.h"
diff --git
a/src/test/test-signal-util.c
b/src/test/test-signal-util.c
index d78d368c0bba5b9525debae297bfee2d18065490..9387d5804baff33fcb8490cac9cff61a69fff842 100644
(file)
--- a/
src/test/test-signal-util.c
+++ b/
src/test/test-signal-util.c
@@
-6,17
+6,9
@@
//#include "log.h"
#include "macro.h"
#include "signal-util.h"
//#include "log.h"
#include "macro.h"
#include "signal-util.h"
+#include "stdio-util.h"
+#include "string-util.h"
/// Additional includes needed by elogind
/// Additional includes needed by elogind
-//#include "stdio-util.h"
-//#include "string-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
-//#include "stdio-util.h"
-//#include "string-util.h"
#include "process-util.h"
#define info(sig) log_info(#sig " = " STRINGIFY(sig) " = %d", sig)
#include "process-util.h"
#define info(sig) log_info(#sig " = " STRINGIFY(sig) " = %d", sig)
diff --git
a/src/test/test-string-util.c
b/src/test/test-string-util.c
index 47032729e09c43a4467a7574bd87a177e18034a3..a9e322f0cc3adefd890d483c03c17c787e1f3bca 100644
(file)
--- a/
src/test/test-string-util.c
+++ b/
src/test/test-string-util.c
@@
-1,11
+1,11
@@
/* SPDX-License-Identifier: LGPL-2.1+ */
#include "alloc-util.h"
/* SPDX-License-Identifier: LGPL-2.1+ */
#include "alloc-util.h"
-
//
#include "locale-util.h"
+#include "locale-util.h"
#include "macro.h"
#include "string-util.h"
#include "strv.h"
#include "macro.h"
#include "string-util.h"
#include "strv.h"
-
//
#include "utf8.h"
+#include "utf8.h"
static void test_string_erase(void) {
char *x;
static void test_string_erase(void) {
char *x;