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:
5817296
)
Prep v229: Add missing fixes from upstream [3/6] src/libelogind
author
Sven Eden
<yamakuzure@gmx.net>
Thu, 27 Apr 2017 10:00:06 +0000
(12:00 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Wed, 17 May 2017 13:22:16 +0000
(15:22 +0200)
src/libelogind/libelogind.sym
patch
|
blob
|
history
src/libelogind/sd-bus/bus-control.c
patch
|
blob
|
history
src/libelogind/sd-bus/bus-internal.h
patch
|
blob
|
history
src/libelogind/sd-bus/bus-socket.c
patch
|
blob
|
history
src/libelogind/sd-event/sd-event.c
patch
|
blob
|
history
diff --git
a/src/libelogind/libelogind.sym
b/src/libelogind/libelogind.sym
index 77c69f8fda81709e8cfd13fbdc42b108aef5b104..5e801400b7faeea5e73c2843075e5dfdb7d14c02 100644
(file)
--- a/
src/libelogind/libelogind.sym
+++ b/
src/libelogind/libelogind.sym
@@
-487,3
+487,14
@@
global:
* sd_listen_fds_with_names;
* } LIBSYSTEMD_226;
*/
* sd_listen_fds_with_names;
* } LIBSYSTEMD_226;
*/
+
+/*
+ * These methods are not needed by elogind.
+ * LIBSYSTEMD_229 {
+ * global:
+ * sd_journal_has_runtime_files;
+ * sd_journal_has_persistent_files;
+ * sd_journal_enumerate_fields;
+ * sd_journal_restart_fields;
+ * } LIBSYSTEMD_227;
+*/
diff --git
a/src/libelogind/sd-bus/bus-control.c
b/src/libelogind/sd-bus/bus-control.c
index c315b1383c12ec5cf5bb382aa49ffce0406b2a15..bd6a96b592b740d674a4c59673e38b7ec75f911a 100644
(file)
--- a/
src/libelogind/sd-bus/bus-control.c
+++ b/
src/libelogind/sd-bus/bus-control.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-91,7
+89,7
@@
static int bus_request_name_kernel(sd_bus *bus, const char *name, uint64_t flags
}
static int bus_request_name_dbus1(sd_bus *bus, const char *name, uint64_t flags) {
}
static int bus_request_name_dbus1(sd_bus *bus, const char *name, uint64_t flags) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
uint32_t ret, param = 0;
int r;
uint32_t ret, param = 0;
int r;
@@
-187,7
+185,7
@@
static int bus_release_name_kernel(sd_bus *bus, const char *name) {
}
static int bus_release_name_dbus1(sd_bus *bus, const char *name) {
}
static int bus_release_name_dbus1(sd_bus *bus, const char *name) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
uint32_t ret;
int r;
uint32_t ret;
int r;
@@
-326,7
+324,7
@@
static int bus_list_names_kernel(sd_bus *bus, char ***acquired, char ***activata
}
static int bus_list_names_dbus1(sd_bus *bus, char ***acquired, char ***activatable) {
}
static int bus_list_names_dbus1(sd_bus *bus, char ***acquired, char ***activatable) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
_cleanup_strv_free_ char **x = NULL, **y = NULL;
int r;
_cleanup_strv_free_ char **x = NULL, **y = NULL;
int r;
@@
-647,7
+645,7
@@
int bus_get_name_creds_kdbus(
bool allow_activator,
sd_bus_creds **creds) {
bool allow_activator,
sd_bus_creds **creds) {
- _cleanup_
bus_creds_unref_
sd_bus_creds *c = NULL;
+ _cleanup_
(sd_bus_creds_unrefp)
sd_bus_creds *c = NULL;
struct kdbus_cmd_info *cmd;
struct kdbus_info *conn_info;
size_t size, l;
struct kdbus_cmd_info *cmd;
struct kdbus_info *conn_info;
size_t size, l;
@@
-753,8
+751,8
@@
static int bus_get_name_creds_dbus1(
uint64_t mask,
sd_bus_creds **creds) {
uint64_t mask,
sd_bus_creds **creds) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply_unique = NULL, *reply = NULL;
- _cleanup_
bus_creds_unref_
sd_bus_creds *c = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply_unique = NULL, *reply = NULL;
+ _cleanup_
(sd_bus_creds_unrefp)
sd_bus_creds *c = NULL;
const char *unique = NULL;
pid_t pid = 0;
int r;
const char *unique = NULL;
pid_t pid = 0;
int r;
@@
-858,7
+856,7
@@
static int bus_get_name_creds_dbus1(
}
if (mask & SD_BUS_CREDS_SELINUX_CONTEXT) {
}
if (mask & SD_BUS_CREDS_SELINUX_CONTEXT) {
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
const void *p = NULL;
size_t sz = 0;
const void *p = NULL;
size_t sz = 0;
@@
-930,7
+928,7
@@
_public_ int sd_bus_get_name_creds(
}
static int bus_get_owner_creds_kdbus(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) {
}
static int bus_get_owner_creds_kdbus(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) {
- _cleanup_
bus_creds_unref_
sd_bus_creds *c = NULL;
+ _cleanup_
(sd_bus_creds_unrefp)
sd_bus_creds *c = NULL;
struct kdbus_cmd_info cmd = {
.size = sizeof(struct kdbus_cmd_info),
};
struct kdbus_cmd_info cmd = {
.size = sizeof(struct kdbus_cmd_info),
};
@@
-979,7
+977,7
@@
static int bus_get_owner_creds_kdbus(sd_bus *bus, uint64_t mask, sd_bus_creds **
}
static int bus_get_owner_creds_dbus1(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) {
}
static int bus_get_owner_creds_dbus1(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) {
- _cleanup_
bus_creds_unref_
sd_bus_creds *c = NULL;
+ _cleanup_
(sd_bus_creds_unrefp)
sd_bus_creds *c = NULL;
pid_t pid = 0;
bool do_label;
int r;
pid_t pid = 0;
bool do_label;
int r;
@@
-1544,7
+1542,7
@@
int bus_remove_match_internal(
#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_name_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) {
#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_name_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL, *m = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL, *m = NULL;
const char *mid;
int r;
const char *mid;
int r;
diff --git
a/src/libelogind/sd-bus/bus-internal.h
b/src/libelogind/sd-bus/bus-internal.h
index b072fcaf443540257a770de1250bef5953bbd3bb..4f08ec19b3db2d82b40f090f0ffc2de63d5c4b29 100644
(file)
--- a/
src/libelogind/sd-bus/bus-internal.h
+++ b/
src/libelogind/sd-bus/bus-internal.h
@@
-381,7
+381,7
@@
char *bus_address_escape(const char *v);
* bus from the callback doesn't destroy the object we are working
* on */
#define BUS_DONT_DESTROY(bus) \
* bus from the callback doesn't destroy the object we are working
* on */
#define BUS_DONT_DESTROY(bus) \
- _cleanup_
bus_unref_
_unused_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)
+ _cleanup_
(sd_bus_unrefp)
_unused_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)
int bus_set_address_system(sd_bus *bus);
#if 0 /// UNNEEDED by elogind
int bus_set_address_system(sd_bus *bus);
#if 0 /// UNNEEDED by elogind
diff --git
a/src/libelogind/sd-bus/bus-socket.c
b/src/libelogind/sd-bus/bus-socket.c
index 067682e1c7a0b39af7ffec666161f8ef6738a081..a2fb3912393b78b9a2175398ced956355d46f036 100644
(file)
--- a/
src/libelogind/sd-bus/bus-socket.c
+++ b/
src/libelogind/sd-bus/bus-socket.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-609,11
+607,11
@@
static void bus_get_peercred(sd_bus *b) {
b->ucred_valid = getpeercred(b->input_fd, &b->ucred) >= 0;
/* Get the SELinux context of the peer */
b->ucred_valid = getpeercred(b->input_fd, &b->ucred) >= 0;
/* Get the SELinux context of the peer */
- if (mac_selinux_
us
e()) {
- r = getpeersec(b->input_fd, &b->label);
- if (r < 0 && r != -EOPNOTSUPP)
- log_debug_errno(r, "Failed to determine peer security context: %m");
-}
+ if (mac_selinux_
hav
e()) {
+
r = getpeersec(b->input_fd, &b->label);
+
if (r < 0 && r != -EOPNOTSUPP)
+
log_debug_errno(r, "Failed to determine peer security context: %m");
+
}
}
static int bus_socket_start_auth_client(sd_bus *b) {
}
static int bus_socket_start_auth_client(sd_bus *b) {
diff --git
a/src/libelogind/sd-event/sd-event.c
b/src/libelogind/sd-event/sd-event.c
index b14e859c7806abe764da59c0b43961f605099708..e32507942a1223928a4abd02fa0d24c963c6510b 100644
(file)
--- a/
src/libelogind/sd-event/sd-event.c
+++ b/
src/libelogind/sd-event/sd-event.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-466,7
+464,9
@@
fail:
}
_public_ sd_event* sd_event_ref(sd_event *e) {
}
_public_ sd_event* sd_event_ref(sd_event *e) {
- assert_return(e, NULL);
+
+ if (!e)
+ return NULL;
assert(e->n_ref >= 1);
e->n_ref++;
assert(e->n_ref >= 1);
e->n_ref++;
@@
-665,8
+665,10
@@
static int event_make_signal_data(
d->priority = priority;
r = hashmap_put(e->signal_data, &d->priority, d);
d->priority = priority;
r = hashmap_put(e->signal_data, &d->priority, d);
- if (r < 0)
+ if (r < 0) {
+ free(d);
return r;
return r;
+ }
added = true;
}
added = true;
}
@@
-1367,7
+1369,9
@@
_public_ int sd_event_add_exit(
#if 0 /// UNNEEDED by elogind
_public_ sd_event_source* sd_event_source_ref(sd_event_source *s) {
#if 0 /// UNNEEDED by elogind
_public_ sd_event_source* sd_event_source_ref(sd_event_source *s) {
- assert_return(s, NULL);
+
+ if (!s)
+ return NULL;
assert(s->n_ref >= 1);
s->n_ref++;
assert(s->n_ref >= 1);
s->n_ref++;