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: sync kdbus.h (ABI break)
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-control.c
diff --git
a/src/libsystemd/sd-bus/bus-control.c
b/src/libsystemd/sd-bus/bus-control.c
index dbd94fc46bbc6e1632899f89394d3c4f7b72fa2d..cf733a663c50d2dbbdf33b618d42c2f8dc21b08c 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-control.c
+++ b/
src/libsystemd/sd-bus/bus-control.c
@@
-169,7
+169,7
@@
static int bus_release_name_kernel(sd_bus *bus, const char *name) {
if (r < 0)
return -errno;
if (r < 0)
return -errno;
- return
n->flags
;
+ return
0
;
}
static int bus_release_name_dbus1(sd_bus *bus, const char *name) {
}
static int bus_release_name_dbus1(sd_bus *bus, const char *name) {
@@
-398,7
+398,7
@@
static int bus_get_owner_kdbus(
struct kdbus_cmd_conn_info *cmd;
struct kdbus_conn_info *conn_info;
struct kdbus_item *item;
struct kdbus_cmd_conn_info *cmd;
struct kdbus_conn_info *conn_info;
struct kdbus_item *item;
- size_t size;
+ size_t size
, l
;
uint64_t m, id;
int r;
uint64_t m, id;
int r;
@@
-410,13
+410,12
@@
static int bus_get_owner_kdbus(
cmd = alloca0_align(size, 8);
cmd->id = id;
} else {
cmd = alloca0_align(size, 8);
cmd->id = id;
} else {
- size_t item_size = KDBUS_ITEM_HEADER_SIZE + strlen(name) + 1;
-
- size = offsetof(struct kdbus_cmd_conn_info, items) + item_size;
+ l = strlen(name) + 1;
+ size = offsetof(struct kdbus_cmd_conn_info, items) + KDBUS_ITEM_SIZE(l);
cmd = alloca0_align(size, 8);
cmd = alloca0_align(size, 8);
- cmd->items[0].size =
item_size
;
+ cmd->items[0].size =
KDBUS_ITEM_HEADER_SIZE + l
;
cmd->items[0].type = KDBUS_ITEM_NAME;
cmd->items[0].type = KDBUS_ITEM_NAME;
-
strcpy(cmd->items[0].str, name
);
+
memcpy(cmd->items[0].str, name, l
);
}
cmd->size = size;
}
cmd->size = size;