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 (from parent 1:
da4b83e
)
Prep v228: Apply more cosmetic changes found in upstream.
author
Sven Eden
<yamakuzure@gmx.net>
Thu, 6 Apr 2017 13:07:20 +0000
(15:07 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Wed, 26 Apr 2017 10:59:13 +0000
(12:59 +0200)
src/basic/def.h
patch
|
blob
|
history
src/basic/fileio-label.h
patch
|
blob
|
history
src/libelogind/sd-bus/bus-common-errors.c
patch
|
blob
|
history
src/libelogind/sd-bus/bus-gvariant.c
patch
|
blob
|
history
src/libelogind/sd-bus/bus-type.h
patch
|
blob
|
history
src/login/test-login-shared.c
patch
|
blob
|
history
src/shared/acl-util.c
patch
|
blob
|
history
diff --git
a/src/basic/def.h
b/src/basic/def.h
index b6541420ae04a4c0c2a943713b0b8def041c602a..574e135f2de66bc20c92172a3fe8364bcd43e0d2 100644
(file)
--- 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 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
#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 b601db7742316052f9e66241ac7b8c5189cf7f92..81f62050b1c630d6aa0b25e321bded3a78a99814 100644
(file)
--- 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);
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 52f8dfd3bebfd51a60ab6a4a047fb679ccae7d1c..8d486fcbbdd62a3297df74f9490bbe8ba4366c9e 100644
(file)
--- a/
src/libelogind/sd-bus/bus-common-errors.c
+++ b/
src/libelogind/sd-bus/bus-common-errors.c
@@
-22,8
+22,9
@@
#include <errno.h>
#include "sd-bus.h"
#include <errno.h>
#include "sd-bus.h"
-#include "bus-error.h"
+
#include "bus-common-errors.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),
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 402d43d66d7221eb2b78ae6907b5f2e88c3beb16..ec027590b206c50f553ab4fa259125ad4b72cf98 100644
(file)
--- 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 <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "bus-type.h"
#include "bus-gvariant.h"
#include "bus-signature.h"
#include "bus-gvariant.h"
#include "bus-signature.h"
+#include "bus-type.h"
int bus_gvariant_get_size(const char *signature) {
const char *p;
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 9a2a4f809ba3e7fead09686c7230d4304f0a1263..ad89e6c91171067b2bbc249d5348a532e4e2201d 100644
(file)
--- a/
src/libelogind/sd-bus/bus-type.h
+++ b/
src/libelogind/sd-bus/bus-type.h
@@
-23,11
+23,12
@@
#include <stdbool.h>
#include <stdbool.h>
-#include "macro.h"
#include "sd-bus.h"
#include "sd-bus.h"
+#include "macro.h"
+
bool bus_type_is_valid(char c) _const_;
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 */
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 e9322b627acebc8b8bc8a57771da341644d014cd..f55e399d276802ec2a432fd633fef86b3a0e3b38 100644
(file)
--- a/
src/login/test-login-shared.c
+++ b/
src/login/test-login-shared.c
@@
-19,8
+19,10
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "macro.h"
#include "login-util.h"
#include "login-util.h"
+#include "macro.h"
+
+/// Additional includes needed by elogind
#include "musl_missing.h"
static void test_session_id_valid(void) {
#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 44076d04c063509246f7ac9137db1c4d721db835..f6e19dcb2ab64d988ac07ab76e036eb7eda186cc 100644
(file)
--- a/
src/shared/acl-util.c
+++ b/
src/shared/acl-util.c
@@
-23,8
+23,11
@@
#include <stdbool.h>
#include "acl-util.h"
#include <stdbool.h>
#include "acl-util.h"
-#include "util.h"
+#include "alloc-util.h"
+#include "string-util.h"
#include "strv.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;
int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
acl_entry_t i;