sd-bus: sync kdbus.h

[elogind.git] / src / libsystemd / sd-bus / sd-memfd.c

diff --git a/src/libsystemd/sd-bus/sd-memfd.c b/src/libsystemd/sd-bus/sd-memfd.c
index 913be2086ac79461593e9174c0700c743dc117cb..7c71476eeef5043d0b096a6ca35c4b4cc6c99656 100644 (file)
--- a/src/libsystemd/sd-bus/sd-memfd.c
+++ b/src/libsystemd/sd-bus/sd-memfd.c
@@ -36,7 +36,7 @@ struct sd_memfd {
         FILE *f;
 };
 
-_public_ int sd_memfd_new(const char *name, sd_memfd **m) {
+_public_ int sd_memfd_new(sd_memfd **m, const char *name) {
 
         struct kdbus_cmd_memfd_make *cmd;
         struct kdbus_item *item;
@@ -92,8 +92,10 @@ _public_ int sd_memfd_new(const char *name, sd_memfd **m) {
         sz = ALIGN8(offsetof(struct kdbus_cmd_memfd_make, items)) +
                 ALIGN8(offsetof(struct kdbus_item, str)) +
                 l + 1;
+
         cmd = alloca0(sz);
         cmd->size = sz;
+
         item = cmd->items;
         item->size = ALIGN8(offsetof(struct kdbus_item, str)) + l + 1;
         item->type = KDBUS_ITEM_MEMFD_NAME;
@@ -113,7 +115,7 @@ _public_ int sd_memfd_new(const char *name, sd_memfd **m) {
         return 0;
 }
 
-_public_ int sd_memfd_make(int fd, sd_memfd **m) {
+_public_ int sd_memfd_new_from_fd(sd_memfd **m, int fd) {
         sd_memfd *n;
         uint64_t sz;
 
@@ -247,11 +249,11 @@ _public_ int sd_memfd_set_size(sd_memfd *m, uint64_t sz) {
         return r;
 }
 
-_public_ int sd_memfd_new_and_map(const char *name, sd_memfd **m, size_t sz, void **p) {
+_public_ int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p) {
         sd_memfd *n;
         int r;
 
-        r = sd_memfd_new(name, &n);
+        r = sd_memfd_new(&n, name);
         if (r < 0)
                 return r;