summaryrefslogtreecommitdiff
path: root/src/libsystemd
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-07-28 18:13:33 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2015-07-29 13:03:09 +0200
commit9a8fb5ae172f03c26618b8a75478417bec8c0dd2 (patch)
tree42b95ccb7c74d4ed57002eaf9519be846cd9c552 /src/libsystemd
parenta388569f609017430133c1c6584eca34cbff3aa3 (diff)
sd-bus: drop redundant code
If c->item_size is 0, the next item to parse in a structure is empty. However, this also implies that the signature must be empty. The latter case is already handled just fine by enter_struct_or_dict_entry() so there is no reason to handle the same case in the caller.
Diffstat (limited to 'src/libsystemd')
-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 081f39d83b..c8806d516a 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -3954,12 +3954,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);