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:
2774f4e
)
Prep v229: Add missing fixes from upstream [6/6] src/systemd
author
Sven Eden
<yamakuzure@gmx.net>
Fri, 28 Apr 2017 05:18:56 +0000
(07:18 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Wed, 17 May 2017 13:22:16 +0000
(15:22 +0200)
src/systemd/_sd-common.h
patch
|
blob
|
history
src/systemd/sd-bus.h
patch
|
blob
|
history
src/systemd/sd-daemon.h
patch
|
blob
|
history
src/systemd/sd-event.h
patch
|
blob
|
history
src/systemd/sd-login.h
patch
|
blob
|
history
src/systemd/sd-messages.h
patch
|
blob
|
history
diff --git
a/src/systemd/_sd-common.h
b/src/systemd/_sd-common.h
index 896a027eb5027a32f1d28a629455518fce60b3d6..2d4e1f26e1ebfe92c55fb56af52573f7fd221127 100644
(file)
--- a/
src/systemd/_sd-common.h
+++ b/
src/systemd/_sd-common.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdcommonhfoo
#define foosdcommonhfoo
#ifndef foosdcommonhfoo
#define foosdcommonhfoo
@@
-57,10
+55,10
@@
# ifdef __cplusplus
# define _SD_BEGIN_DECLARATIONS \
extern "C" { \
# ifdef __cplusplus
# define _SD_BEGIN_DECLARATIONS \
extern "C" { \
- struct _
_useless_struct_to_allow_trailing_semicolon_
_
+ struct _
sd_useless_struct_to_allow_trailing_semicolon
_
# else
# define _SD_BEGIN_DECLARATIONS \
# else
# define _SD_BEGIN_DECLARATIONS \
- struct _
_useless_struct_to_allow_trailing_semicolon_
_
+ struct _
sd_useless_struct_to_allow_trailing_semicolon
_
# endif
#endif
# endif
#endif
@@
-68,11
+66,18
@@
# ifdef __cplusplus
# define _SD_END_DECLARATIONS \
} \
# ifdef __cplusplus
# define _SD_END_DECLARATIONS \
} \
- struct _
_useless_struct_to_allow_trailing_semicolon_
_
+ struct _
sd_useless_cpp_struct_to_allow_trailing_semicolon
_
# else
# define _SD_END_DECLARATIONS \
# else
# define _SD_END_DECLARATIONS \
- struct _
_useless_struct_to_allow_trailing_semicolon_
_
+ struct _
sd_useless_struct_to_allow_trailing_semicolon
_
# endif
#endif
# endif
#endif
+#define _SD_DEFINE_POINTER_CLEANUP_FUNC(type, func) \
+ static inline void func##p(type **p) { \
+ if (*p) \
+ func(*p); \
+ } \
+ struct _sd_useless_struct_to_allow_trailing_semicolon_
+
#endif
#endif
diff --git
a/src/systemd/sd-bus.h
b/src/systemd/sd-bus.h
index b23a7d21ea89882d4e7249c8418e0f8ce47c4473..402c61dae22369b53b1fb7e74f1454f061f5421a 100644
(file)
--- a/
src/systemd/sd-bus.h
+++ b/
src/systemd/sd-bus.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdbushfoo
#define foosdbushfoo
#ifndef foosdbushfoo
#define foosdbushfoo
@@
-27,8
+25,9
@@
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/types.h>
#include <sys/uio.h>
-#include "sd-id128.h"
#include "sd-event.h"
#include "sd-event.h"
+#include "sd-id128.h"
+
#include "_sd-common.h"
_SD_BEGIN_DECLARATIONS;
#include "_sd-common.h"
_SD_BEGIN_DECLARATIONS;
@@
-167,6
+166,8
@@
sd_bus *sd_bus_flush_close_unref(sd_bus *bus);
#if 0 /// UNNEEDED by elogind
void sd_bus_default_flush_close(void);
#if 0 /// UNNEEDED by elogind
void sd_bus_default_flush_close(void);
+int sd_bus_is_open(sd_bus *bus);
+
int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id);
int sd_bus_get_scope(sd_bus *bus, const char **scope);
int sd_bus_get_tid(sd_bus *bus, pid_t *tid);
int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id);
int sd_bus_get_scope(sd_bus *bus, const char **scope);
int sd_bus_get_tid(sd_bus *bus, pid_t *tid);
@@
-512,6
+513,14
@@
const char* sd_bus_track_contains(sd_bus_track *track, const char *names);
const char* sd_bus_track_first(sd_bus_track *track);
const char* sd_bus_track_next(sd_bus_track *track);
const char* sd_bus_track_first(sd_bus_track *track);
const char* sd_bus_track_next(sd_bus_track *track);
+/* Define helpers so that __attribute__((cleanup(sd_bus_unrefp))) and similar may be used. */
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_bus, sd_bus_unref);
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_bus, sd_bus_flush_close_unref);
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_bus_slot, sd_bus_slot_unref);
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_bus_message, sd_bus_message_unref);
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_bus_creds, sd_bus_creds_unref);
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_bus_track, sd_bus_track_unref);
+
_SD_END_DECLARATIONS;
#endif
_SD_END_DECLARATIONS;
#endif
diff --git
a/src/systemd/sd-daemon.h
b/src/systemd/sd-daemon.h
index 90d0ca31a1aa7272d8b5ab229e0171a1e8832477..bb7f34e32d2785b9288766fb565ec0fed3b7fd8f 100644
(file)
--- a/
src/systemd/sd-daemon.h
+++ b/
src/systemd/sd-daemon.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosddaemonhfoo
#define foosddaemonhfoo
#ifndef foosddaemonhfoo
#define foosddaemonhfoo
@@
-22,8
+20,8
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
#include <inttypes.h>
#include <inttypes.h>
+#include <sys/types.h>
#include "_sd-common.h"
#include "_sd-common.h"
diff --git
a/src/systemd/sd-event.h
b/src/systemd/sd-event.h
index 79269bcb3cc71c57fd6f3e16990fe658c44a4191..fd32ac85650b9ebae99a39674e2a149e0b921fba 100644
(file)
--- a/
src/systemd/sd-event.h
+++ b/
src/systemd/sd-event.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdeventhfoo
#define foosdeventhfoo
#ifndef foosdeventhfoo
#define foosdeventhfoo
@@
-22,11
+20,11
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
-#include <sys/signalfd.h>
-#include <sys/epoll.h>
#include <inttypes.h>
#include <signal.h>
#include <inttypes.h>
#include <signal.h>
+#include <sys/epoll.h>
+#include <sys/signalfd.h>
+#include <sys/types.h>
#include "_sd-common.h"
#include "_sd-common.h"
@@
-56,7
+54,8
@@
enum {
SD_EVENT_PENDING,
SD_EVENT_RUNNING,
SD_EVENT_EXITING,
SD_EVENT_PENDING,
SD_EVENT_RUNNING,
SD_EVENT_EXITING,
- SD_EVENT_FINISHED
+ SD_EVENT_FINISHED,
+ SD_EVENT_PREPARING,
};
enum {
};
enum {
@@
-89,9
+88,9
@@
int sd_event_add_post(sd_event *e, sd_event_source **s, sd_event_handler_t callb
int sd_event_add_exit(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
int sd_event_prepare(sd_event *e);
int sd_event_add_exit(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
int sd_event_prepare(sd_event *e);
-int sd_event_wait(sd_event *e, uint64_t
timeout
);
+int sd_event_wait(sd_event *e, uint64_t
usec
);
int sd_event_dispatch(sd_event *e);
int sd_event_dispatch(sd_event *e);
-int sd_event_run(sd_event *e, uint64_t
timeout
);
+int sd_event_run(sd_event *e, uint64_t
usec
);
#if 0 /// UNNEEDED by elogind
int sd_event_loop(sd_event *e);
#endif // 0
#if 0 /// UNNEEDED by elogind
int sd_event_loop(sd_event *e);
#endif // 0
@@
-156,6
+155,10
@@
int sd_event_source_get_signal(sd_event_source *s);
int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid);
#endif // 0
int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid);
#endif // 0
+/* Define helpers so that __attribute__((cleanup(sd_event_unrefp))) and similar may be used. */
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_event, sd_event_unref);
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_event_source, sd_event_source_unref);
+
_SD_END_DECLARATIONS;
#endif
_SD_END_DECLARATIONS;
#endif
diff --git
a/src/systemd/sd-login.h
b/src/systemd/sd-login.h
index 59c6eedcda5f6702dca85b3e8d8e6dd78aec979d..3c10ff032fe7cab39b50df3f26eee52f0a3397ad 100644
(file)
--- a/
src/systemd/sd-login.h
+++ b/
src/systemd/sd-login.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdloginhfoo
#define foosdloginhfoo
#ifndef foosdloginhfoo
#define foosdloginhfoo
@@
-22,8
+20,8
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
#include <inttypes.h>
#include <inttypes.h>
+#include <sys/types.h>
#include "_sd-common.h"
#include "_sd-common.h"
@@
-240,6
+238,8
@@
int sd_login_monitor_get_events(sd_login_monitor *m);
/* Get timeout for poll(), as usec value relative to CLOCK_MONOTONIC's epoch */
int sd_login_monitor_get_timeout(sd_login_monitor *m, uint64_t *timeout_usec);
/* Get timeout for poll(), as usec value relative to CLOCK_MONOTONIC's epoch */
int sd_login_monitor_get_timeout(sd_login_monitor *m, uint64_t *timeout_usec);
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_login_monitor, sd_login_monitor_unref);
+
_SD_END_DECLARATIONS;
#endif
_SD_END_DECLARATIONS;
#endif
diff --git
a/src/systemd/sd-messages.h
b/src/systemd/sd-messages.h
index 8aedaec6d1b69101fbb70e7cfd7d919f8b539f59..8a72576ec8327ae9d69c38e10dab2985293e646d 100644
(file)
--- a/
src/systemd/sd-messages.h
+++ b/
src/systemd/sd-messages.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdmessageshfoo
#define foosdmessageshfoo
#ifndef foosdmessageshfoo
#define foosdmessageshfoo
@@
-23,6
+21,7
@@
***/
#include "sd-id128.h"
***/
#include "sd-id128.h"
+
#include "_sd-common.h"
_SD_BEGIN_DECLARATIONS;
#include "_sd-common.h"
_SD_BEGIN_DECLARATIONS;
@@
-85,6
+84,10
@@
_SD_BEGIN_DECLARATIONS;
#define SD_MESSAGE_BOOTCHART SD_ID128_MAKE(9f,26,aa,56,2c,f4,40,c2,b1,6c,77,3d,04,79,b5,18)
#define SD_MESSAGE_BOOTCHART SD_ID128_MAKE(9f,26,aa,56,2c,f4,40,c2,b1,6c,77,3d,04,79,b5,18)
+#define SD_MESSAGE_DNSSEC_FAILURE SD_ID128_MAKE(16,75,d7,f1,72,17,40,98,b1,10,8b,f8,c7,dc,8f,5d)
+#define SD_MESSAGE_DNSSEC_TRUST_ANCHOR_REVOKED SD_ID128_MAKE(4d,44,08,cf,d0,d1,44,85,91,84,d1,e6,5d,7c,8a,65)
+#define SD_MESSAGE_DNSSEC_DOWNGRADE SD_ID128_MAKE(36,db,2d,fa,5a,90,45,e1,bd,4a,f5,f9,3e,1c,f0,57)
+
_SD_END_DECLARATIONS;
#endif
_SD_END_DECLARATIONS;
#endif