chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: reuse the KDBUS_CMD_FREE wrapper wherever appropriate
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd/sd-bus/bus-kernel.c
b/src/libsystemd/sd-bus/bus-kernel.c
index e73a5077b54948e5ab1a639bfd21a053009460a9..b4d0af102faf7d056cb5d46cd7a05bdfae4f8635 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-kernel.c
+++ b/
src/libsystemd/sd-bus/bus-kernel.c
@@
-822,10
+822,6
@@
fail:
}
int bus_kernel_take_fd(sd_bus *b) {
}
int bus_kernel_take_fd(sd_bus *b) {
- struct kdbus_cmd_free cmd_free = {
- .size = sizeof(cmd_free),
- .flags = 0,
- };
struct kdbus_bloom_parameter *bloom = NULL;
struct kdbus_cmd_hello *hello;
struct kdbus_item_list *items;
struct kdbus_bloom_parameter *bloom = NULL;
struct kdbus_cmd_hello *hello;
struct kdbus_item_list *items;
@@
-989,12
+985,10
@@
int bus_kernel_take_fd(sd_bus *b) {
/* free returned items */
(void) bus_kernel_cmd_free(b, hello->offset);
/* free returned items */
(void) bus_kernel_cmd_free(b, hello->offset);
-
return bus_start_running(b);
fail:
return bus_start_running(b);
fail:
- cmd_free.offset = hello->offset;
- (void) ioctl(b->input_fd, KDBUS_CMD_FREE, &cmd_free);
+ (void) bus_kernel_cmd_free(b, hello->offset);
return r;
}
return r;
}
@@
-1019,7
+1013,6
@@
int bus_kernel_connect(sd_bus *b) {
int bus_kernel_cmd_free(sd_bus *bus, uint64_t offset) {
struct kdbus_cmd_free cmd = {
.size = sizeof(cmd),
int bus_kernel_cmd_free(sd_bus *bus, uint64_t offset) {
struct kdbus_cmd_free cmd = {
.size = sizeof(cmd),
- .flags = 0,
.offset = offset,
};
int r;
.offset = offset,
};
int r;