dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 14:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-bus: always go through sd_bus_unref() to free messages

Browse Source 
Don't try to be smart, don't bypass the ref counting logic if there's no
real reason to.

This matters if we want to tweak the ref counting logic later.
This commit is contained in:
Lennart Poettering
2019-01-17 21:07:42 +01:00
parent 39feb2ce41
commit b41812d1e3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsystemd/sd-bus/bus-message.c
View File

@@ -136,8 +136,6 @@ static sd_bus_message* message_free(sd_bus_message *m) {
return mfree(m);
}
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_bus_message*, message_free);
static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz, bool add_offset) {
void *op, *np;
size_t old_size, new_size, start;
@@ -529,7 +527,7 @@ int bus_message_from_malloc(
const char *label,
sd_bus_message **ret) {
_cleanup_(message_freep) sd_bus_message *m = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
size_t sz;
int r;
@@ -648,7 +646,7 @@ _public_ int sd_bus_message_new_method_call(
const char *interface,
const char *member) {
_cleanup_(message_freep) sd_bus_message *t = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *t = NULL;
int r;
assert_return(bus, -ENOTCONN);
@@ -693,7 +691,7 @@ static int message_new_reply(
uint8_t type,
sd_bus_message **m) {
_cleanup_(message_freep) sd_bus_message *t = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *t = NULL;
uint64_t cookie;
int r;
@@ -744,7 +742,7 @@ _public_ int sd_bus_message_new_method_error(
sd_bus_message **m,
const sd_bus_error *e) {
_cleanup_(message_freep) sd_bus_message *t = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *t = NULL;
int r;
assert_return(sd_bus_error_is_set(e), -EINVAL);
@@ -847,7 +845,7 @@ int bus_message_new_synthetic_error(
const sd_bus_error *e,
sd_bus_message **m) {
_cleanup_(message_freep) sd_bus_message *t = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *t = NULL;
int r;
assert(bus);