summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Wereski <m.wereski@partner.samsung.com>2015-08-28 01:05:24 -0700
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2015-08-28 01:05:24 -0700
commit337a625da91ba7ac37480b7efd1453875b9d841d (patch)
tree5b21f23a790235c46f09e731fdf65c0aeb6c4711
parentb4e4d77f3041ca431339bd44a662c990ceb1e9a3 (diff)
parent1a7ffa7a31b585364ce0790c831a4dd818cdcd94 (diff)
downloadsystemd-337a625da91ba7ac37480b7efd1453875b9d841d.tar.gz
systemd-337a625da91ba7ac37480b7efd1453875b9d841d.tar.bz2
systemd-337a625da91ba7ac37480b7efd1453875b9d841d.zip
Merge "sd-bus: drop redundant code" into tizen
-rw-r--r--src/libsystemd/sd-bus/bus-message.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index e04f6e3811..aeecec7426 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -3974,12 +3974,6 @@ static int enter_struct_or_dict_entry(
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);