From 94c5f7fa9e34517edad75cd63d71dd459ec4f133 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Thu, 6 Apr 2017 15:07:20 +0200 Subject: [PATCH 1/1] Prep v228: Apply more cosmetic changes found in upstream. --- src/basic/def.h | 6 ------ src/basic/fileio-label.h | 2 ++ src/libelogind/sd-bus/bus-common-errors.c | 3 ++- src/libelogind/sd-bus/bus-gvariant.c | 2 +- src/libelogind/sd-bus/bus-type.h | 5 +++-- src/login/test-login-shared.c | 4 +++- src/shared/acl-util.c | 5 ++++- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/basic/def.h b/src/basic/def.h index b6541420a..574e135f2 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -42,12 +42,6 @@ #define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT #define SIGNALS_IGNORE SIGPIPE -#define DIGITS "0123456789" -#define LOWERCASE_LETTERS "abcdefghijklmnopqrstuvwxyz" -#define UPPERCASE_LETTERS "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#define LETTERS LOWERCASE_LETTERS UPPERCASE_LETTERS -#define ALPHANUMERICAL LETTERS DIGITS - #define REBOOT_PARAM_FILE "/run/systemd/reboot-param" #ifdef HAVE_SPLIT_USR diff --git a/src/basic/fileio-label.h b/src/basic/fileio-label.h index b601db774..81f62050b 100644 --- a/src/basic/fileio-label.h +++ b/src/basic/fileio-label.h @@ -27,3 +27,5 @@ int write_string_file_atomic_label(const char *fn, const char *line); // UNNEEDED int write_env_file_label(const char *fname, char **l); +// UNNEEDED int fopen_temporary_label(const char *target, +// UNNEEDED const char *path, FILE **f, char **temp_path); diff --git a/src/libelogind/sd-bus/bus-common-errors.c b/src/libelogind/sd-bus/bus-common-errors.c index 52f8dfd3b..8d486fcbb 100644 --- a/src/libelogind/sd-bus/bus-common-errors.c +++ b/src/libelogind/sd-bus/bus-common-errors.c @@ -22,8 +22,9 @@ #include #include "sd-bus.h" -#include "bus-error.h" + #include "bus-common-errors.h" +#include "bus-error.h" BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = { SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_UNIT, ENOENT), diff --git a/src/libelogind/sd-bus/bus-gvariant.c b/src/libelogind/sd-bus/bus-gvariant.c index 402d43d66..ec027590b 100644 --- a/src/libelogind/sd-bus/bus-gvariant.c +++ b/src/libelogind/sd-bus/bus-gvariant.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include "bus-type.h" #include "bus-gvariant.h" #include "bus-signature.h" +#include "bus-type.h" int bus_gvariant_get_size(const char *signature) { const char *p; diff --git a/src/libelogind/sd-bus/bus-type.h b/src/libelogind/sd-bus/bus-type.h index 9a2a4f809..ad89e6c91 100644 --- a/src/libelogind/sd-bus/bus-type.h +++ b/src/libelogind/sd-bus/bus-type.h @@ -23,11 +23,12 @@ #include -#include "macro.h" #include "sd-bus.h" +#include "macro.h" + bool bus_type_is_valid(char c) _const_; -// UNNEEDED bool bus_type_is_valid_in_signature(char c) _const_; +bool bus_type_is_valid_in_signature(char c) _const_; bool bus_type_is_basic(char c) _const_; /* "trivial" is systemd's term for what the D-Bus Specification calls * a "fixed type": that is, a basic type of fixed length */ diff --git a/src/login/test-login-shared.c b/src/login/test-login-shared.c index e9322b627..f55e399d2 100644 --- a/src/login/test-login-shared.c +++ b/src/login/test-login-shared.c @@ -19,8 +19,10 @@ along with systemd; If not, see . ***/ -#include "macro.h" #include "login-util.h" +#include "macro.h" + +/// Additional includes needed by elogind #include "musl_missing.h" static void test_session_id_valid(void) { diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c index 44076d04c..f6e19dcb2 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -23,8 +23,11 @@ #include #include "acl-util.h" -#include "util.h" +#include "alloc-util.h" +#include "string-util.h" #include "strv.h" +#include "user-util.h" +#include "util.h" int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) { acl_entry_t i; -- 2.30.2