sd-bus: drop redundant code

[elogind.git] / src / libelogind / sd-bus / bus-message.c

diff --git a/src/libelogind/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c
index 70c38cf487be80bb14b7493c8e1727f8fc6991af..c8806d516ada152ecc5f0e9223b03bd21d887b6d 100644 (file)
--- a/src/libelogind/sd-bus/bus-message.c
+++ b/src/libelogind/sd-bus/bus-message.c
@@ -435,7 +435,6 @@ int bus_message_from_header(
                 size_t message_size,
                 int *fds,
                 unsigned n_fds,
                 size_t message_size,
                 int *fds,
                 unsigned n_fds,

-                const struct ucred *ucred,

                 const char *label,
                 size_t extra,
                 sd_bus_message **ret) {
                 const char *label,
                 size_t extra,
                 sd_bus_message **ret) {


@@ -528,23 +527,6 @@ int bus_message_from_header(
         m->fds = fds;
         m->n_fds = n_fds;
 
         m->fds = fds;
         m->n_fds = n_fds;
 

-        if (ucred) {
-                m->creds.pid = ucred->pid;
-                m->creds.euid = ucred->uid;
-                m->creds.egid = ucred->gid;
-
-                /* Due to namespace translations some data might be
-                 * missing from this ucred record. */
-                if (m->creds.pid > 0)
-                        m->creds.mask |= SD_BUS_CREDS_PID;
-
-                if (m->creds.euid != UID_INVALID)
-                        m->creds.mask |= SD_BUS_CREDS_EUID;
-
-                if (m->creds.egid != GID_INVALID)
-                        m->creds.mask |= SD_BUS_CREDS_EGID;
-        }
-

         if (label) {
                 m->creds.label = (char*) m + ALIGN(sizeof(sd_bus_message)) + ALIGN(extra);
                 memcpy(m->creds.label, label, label_sz + 1);
         if (label) {
                 m->creds.label = (char*) m + ALIGN(sizeof(sd_bus_message)) + ALIGN(extra);
                 memcpy(m->creds.label, label, label_sz + 1);


@@ -565,7 +547,6 @@ int bus_message_from_malloc(
                 size_t length,
                 int *fds,
                 unsigned n_fds,
                 size_t length,
                 int *fds,
                 unsigned n_fds,

-                const struct ucred *ucred,

                 const char *label,
                 sd_bus_message **ret) {
 
                 const char *label,
                 sd_bus_message **ret) {
 


@@ -579,7 +560,7 @@ int bus_message_from_malloc(
                         buffer, length,
                         length,
                         fds, n_fds,
                         buffer, length,
                         length,
                         fds, n_fds,

-                        ucred, label,
+                        label,

                         0, &m);
         if (r < 0)
                 return r;
                         0, &m);
         if (r < 0)
                 return r;


@@ -822,7 +803,7 @@ _public_ int sd_bus_message_new_method_errorf(
                 const char *format,
                 ...) {
 
                 const char *format,
                 ...) {
 

-        _cleanup_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;

         va_list ap;
 
         assert_return(name, -EINVAL);
         va_list ap;
 
         assert_return(name, -EINVAL);


@@ -841,7 +822,7 @@ _public_ int sd_bus_message_new_method_errno(
                 int error,
                 const sd_bus_error *p) {
 
                 int error,
                 const sd_bus_error *p) {
 

-        _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+        _cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;

 
         if (sd_bus_error_is_set(p))
                 return sd_bus_message_new_method_error(call, m, p);
 
         if (sd_bus_error_is_set(p))
                 return sd_bus_message_new_method_error(call, m, p);


@@ -858,7 +839,7 @@ _public_ int sd_bus_message_new_method_errnof(
                 const char *format,
                 ...) {
 
                 const char *format,
                 ...) {
 

-        _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+        _cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;

         va_list ap;
 
         va_start(ap, format);
         va_list ap;
 
         va_start(ap, format);


@@ -2180,6 +2161,7 @@ static int bus_message_close_variant(sd_bus_message *m, struct bus_container *c)
 }
 
 static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c, bool add_offset) {
 }
 
 static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c, bool add_offset) {

+        bool fixed_size = true;

         size_t n_variable = 0;
         unsigned i = 0;
         const char *p;
         size_t n_variable = 0;
         unsigned i = 0;
         const char *p;


@@ -2215,6 +2197,8 @@ static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c,
                 /* We need to add an offset for each item that has a
                  * variable size and that is not the last one in the
                  * list */
                 /* We need to add an offset for each item that has a
                  * variable size and that is not the last one in the
                  * list */

+                if (r == 0)
+                        fixed_size = false;

                 if (r == 0 && p[n] != 0)
                         n_variable++;
 
                 if (r == 0 && p[n] != 0)
                         n_variable++;
 


@@ -2226,7 +2210,19 @@ static int bus_message_close_struct(sd_bus_message *m, struct bus_container *c,
         assert(c->need_offsets || n_variable == 0);
 
         if (n_variable <= 0) {
         assert(c->need_offsets || n_variable == 0);
 
         if (n_variable <= 0) {

-                a = message_extend_body(m, 1, 0, add_offset, false);
+                int alignment = 1;
+
+                /* Structures with fixed-size members only have to be
+                 * fixed-size themselves. But gvariant requires all fixed-size
+                 * elements to be sized a multiple of their alignment. Hence,
+                 * we must *always* add final padding after the last member so
+                 * the overall size of the structure is properly aligned. */
+                if (fixed_size)
+                        alignment = bus_gvariant_get_alignment(strempty(c->signature));
+
+                assert(alignment > 0);
+
+                a = message_extend_body(m, alignment, 0, add_offset, false);

                 if (!a)
                         return -ENOMEM;
         } else {
                 if (!a)
                         return -ENOMEM;
         } else {


@@ -3958,12 +3954,6 @@ static int enter_struct_or_dict_entry(
                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 

-        } else if (c->item_size <= 0) {
-
-                /* gvariant empty struct */
-                *item_size = 0;
-                *offsets = NULL;
-                *n_offsets = 0;

         } else
                 /* gvariant with contents */
                 return build_struct_offsets(m, contents, c->item_size, item_size, offsets, n_offsets);
         } else
                 /* gvariant with contents */
                 return build_struct_offsets(m, contents, c->item_size, item_size, offsets, n_offsets);


@@ -4760,7 +4750,6 @@ _public_ int sd_bus_message_skip(sd_bus_message *m, const char *types) {
                         r = sd_bus_message_skip(m, s);
                         if (r < 0)
                                 return r;
                         r = sd_bus_message_skip(m, s);
                         if (r < 0)
                                 return r;

-                        assert(r != 0);

 
                         r = sd_bus_message_exit_container(m);
                         if (r < 0)
 
                         r = sd_bus_message_exit_container(m);
                         if (r < 0)


@@ -5550,6 +5539,7 @@ int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz) {
 }
 
 int bus_message_read_strv_extend(sd_bus_message *m, char ***l) {
 }
 
 int bus_message_read_strv_extend(sd_bus_message *m, char ***l) {

+        const char *s;

         int r;
 
         assert(m);
         int r;
 
         assert(m);


@@ -5559,19 +5549,13 @@ int bus_message_read_strv_extend(sd_bus_message *m, char ***l) {
         if (r <= 0)
                 return r;
 
         if (r <= 0)
                 return r;
 

-        for (;;) {
-                const char *s;
-
-                r = sd_bus_message_read_basic(m, 's', &s);
-                if (r < 0)
-                        return r;
-                if (r == 0)
-                        break;
-
+        while ((r = sd_bus_message_read_basic(m, 's', &s)) > 0) {

                 r = strv_extend(l, s);
                 if (r < 0)
                         return r;
         }
                 r = strv_extend(l, s);
                 if (r < 0)
                         return r;
         }

+        if (r < 0)
+                return r;

 
         r = sd_bus_message_exit_container(m);
         if (r < 0)
 
         r = sd_bus_message_exit_container(m);
         if (r < 0)