From 9a8fb5ae172f03c26618b8a75478417bec8c0dd2 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 28 Jul 2015 18:13:33 +0200 Subject: 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. --- src/libsystemd/sd-bus/bus-message.c | 6 ------ 1 file changed, 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); -- cgit v1.2.3-54-g00ecf