SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-bus: initialize a few structs at time or declaration

Browse Source
This commit is contained in:
Lennart Poettering
2015-02-13 17:18:36 +01:00
parent 95eb099fa8
commit e044970a29
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/bus-control.c
+9 -10
View File
@@ -233,16 +233,16 @@ _public_ int sd_bus_release_name(sd_bus *bus, const char *name) {
}
static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
struct kdbus_cmd_list cmd = {};
struct kdbus_cmd_list cmd = {
.size = sizeof(cmd),
.flags = flags,
};
struct kdbus_info *name_list, *name;
uint64_t previous_id = 0;
int r;
/* Caller will free half-constructed list on failure... */
cmd.size = sizeof(cmd);
cmd.flags = flags;
r = ioctl(bus->input_fd, KDBUS_CMD_LIST, &cmd);
if (r < 0)
return -errno;
@@ -896,7 +896,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) {
_cleanup_bus_creds_unref_ sd_bus_creds *c = NULL;
struct kdbus_cmd_info cmd = {
.size = sizeof(struct kdbus_cmd_info)
.size = sizeof(struct kdbus_cmd_info),
};
struct kdbus_info *creator_info;
pid_t pid = 0;
@@ -1403,7 +1403,10 @@ int bus_remove_match_internal_kernel(
sd_bus *bus,
uint64_t cookie) {
struct kdbus_cmd_match m;
struct kdbus_cmd_match m = {
.size = offsetof(struct kdbus_cmd_match, items),
.cookie = cookie,
};
int r;
assert(bus);
@@ -1412,10 +1415,6 @@ int bus_remove_match_internal_kernel(
if (bus->hello_flags & KDBUS_HELLO_MONITOR)
return 0;
zero(m);
m.size = offsetof(struct kdbus_cmd_match, items);
m.cookie = cookie;
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_REMOVE, &m);
if (r < 0)
return -errno;