bus: switch to multiple KDBUS_ITEM_NAME including the flags

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

diff --git a/src/libsystemd-bus/bus-convenience.c b/src/libsystemd-bus/bus-convenience.c
index e57b26bf6b98e5cbb73331e369a08348b9577fe4..3964960fab150616a8998c940fdf945675bf172d 100644 (file)
--- a/src/libsystemd-bus/bus-convenience.c
+++ b/src/libsystemd-bus/bus-convenience.c
@@ -103,7 +103,7 @@ _public_ int sd_bus_reply_method_return(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         r = sd_bus_message_new_method_return(call, &m);
@@ -137,7 +137,7 @@ _public_ int sd_bus_reply_method_error(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         r = sd_bus_message_new_method_error(call, e, &m);
@@ -162,7 +162,7 @@ _public_ int sd_bus_reply_method_errorf(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         va_start(ap, format);
@@ -185,7 +185,7 @@ _public_ int sd_bus_reply_method_errno(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         if (sd_bus_error_is_set(p))
@@ -211,7 +211,7 @@ _public_ int sd_bus_reply_method_errnof(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         va_start(ap, format);
@@ -433,10 +433,10 @@ _public_ int sd_bus_query_sender_creds(sd_bus_message *call, uint64_t mask, sd_b
                  * to get it from the sender or peer */
 
                 if (call->sender)
-                        return sd_bus_get_owner_creds(call->bus, call->sender, mask, creds);
+                        return sd_bus_get_owner(call->bus, call->sender, mask, creds);
                 else
                         return sd_bus_get_peer_creds(call->bus, mask, creds);
         }
 
-        return sd_bus_creds_extend(c, mask, creds);
+        return bus_creds_extend_by_pid(c, mask, creds);
 }