fileio: in envfiles, do not skip lines following empty lines

[elogind.git] / src / libsystemd-bus / bus-control.c

diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index 7c139cfd32cab7cb579e837056d58204ce7a9466..185f77c968d2873e67b1ed5612dc18c63cf2be20 100644 (file)
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd-bus/bus-control.c
@@ -64,7 +64,7 @@ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
                 l = strlen(name);
                 n = alloca(offsetof(struct kdbus_cmd_name, name) + l + 1);
                 n->size = offsetof(struct kdbus_cmd_name, name) + l + 1;
-                n->flags = flags;
+                n->name_flags = flags;
                 n->id = 0;
                 memcpy(n->name, name, l+1);
 
@@ -72,7 +72,7 @@ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
                 if (r < 0)
                         return -errno;
 
-                return n->flags;
+                return n->name_flags;
         } else {
                 r = sd_bus_call_method(
                                 bus,
@@ -115,7 +115,7 @@ int sd_bus_release_name(sd_bus *bus, const char *name) {
                 l = strlen(name);
                 n = alloca(offsetof(struct kdbus_cmd_name, name) + l + 1);
                 n->size = offsetof(struct kdbus_cmd_name, name) + l + 1;
-                n->flags = 0;
+                n->name_flags = 0;
                 n->id = 0;
                 memcpy(n->name, name, l+1);
 
@@ -123,7 +123,7 @@ int sd_bus_release_name(sd_bus *bus, const char *name) {
                 if (r < 0)
                         return -errno;
 
-                return n->flags;
+                return n->name_flags;
         } else {
                 r = sd_bus_call_method(
                                 bus,