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: correct spacing near eol in code comments
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-message.c
diff --git
a/src/libsystemd/sd-bus/bus-message.c
b/src/libsystemd/sd-bus/bus-message.c
index 06d8d770fdba6e0f8d4b86064c6408b8cd495b92..313402933720fd81d90e3c05b57943210118ccb9 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-message.c
+++ b/
src/libsystemd/sd-bus/bus-message.c
@@
-65,9
+65,11
@@
static void message_free_part(sd_bus_message *m, struct bus_body_part *part) {
/* If we can reuse the memfd, try that. For that it
* can't be sealed yet. */
/* If we can reuse the memfd, try that. For that it
* can't be sealed yet. */
- if (!part->sealed)
+ if (!part->sealed) {
+ assert(part->memfd_offset == 0);
+ assert(part->data == part->mmap_begin);
bus_kernel_push_memfd(m->bus, part->memfd, part->data, part->mapped, part->allocated);
bus_kernel_push_memfd(m->bus, part->memfd, part->data, part->mapped, part->allocated);
- else {
+
}
else {
if (part->mapped > 0)
assert_se(munmap(part->mmap_begin, part->mapped) == 0);
if (part->mapped > 0)
assert_se(munmap(part->mmap_begin, part->mapped) == 0);
@@
-128,7
+130,7
@@
static void message_free(sd_bus_message *m) {
message_reset_parts(m);
if (m->release_kdbus) {
message_reset_parts(m);
if (m->release_kdbus) {
- struct kdbus_cmd_free cmd_free;
+ struct kdbus_cmd_free cmd_free
= { }
;
cmd_free.flags = 0;
cmd_free.offset = (uint8_t *)m->kdbus - (uint8_t *)m->bus->kdbus_buffer;
cmd_free.flags = 0;
cmd_free.offset = (uint8_t *)m->kdbus - (uint8_t *)m->bus->kdbus_buffer;
@@
-1103,8
+1105,10
@@
static int part_make_space(
if (m->poisoned)
return -ENOMEM;
if (m->poisoned)
return -ENOMEM;
- if (!part->data && part->memfd < 0)
+ if (!part->data && part->memfd < 0)
{
part->memfd = bus_kernel_pop_memfd(m->bus, &part->data, &part->mapped, &part->allocated);
part->memfd = bus_kernel_pop_memfd(m->bus, &part->data, &part->mapped, &part->allocated);
+ part->mmap_begin = part->data;
+ }
if (part->memfd >= 0) {
if (part->memfd >= 0) {
@@
-1346,7
+1350,7
@@
int message_append_basic(sd_bus_message *m, char type, const void *p, const void
} else {
char *e;
} else {
char *e;
- /* Maybe we can append to the signature? But only if this is the top-level container*/
+ /* Maybe we can append to the signature? But only if this is the top-level container
*/
if (c->enclosing != 0)
return -ENXIO;
if (c->enclosing != 0)
return -ENXIO;
@@
-1539,7
+1543,7
@@
_public_ int sd_bus_message_append_string_space(
} else {
char *e;
} else {
char *e;
- /* Maybe we can append to the signature? But only if this is the top-level container*/
+ /* Maybe we can append to the signature? But only if this is the top-level container
*/
if (c->enclosing != 0)
return -ENXIO;
if (c->enclosing != 0)
return -ENXIO;
@@
-2693,7
+2697,7
@@
_public_ int sd_bus_message_append_string_memfd(
} else {
char *e;
} else {
char *e;
- /* Maybe we can append to the signature? But only if this is the top-level container*/
+ /* Maybe we can append to the signature? But only if this is the top-level container
*/
if (c->enclosing != 0)
return -ENXIO;
if (c->enclosing != 0)
return -ENXIO;