diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-20 23:40:44 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-22 10:54:38 +0100 |
| commit | baaa35ad706419ae5aacc11d2bece5bd8b73ee42 (patch) | |
| tree | bb4b9c576fc56b3237d59e959ded7c245917fcd7 /src/libsystemd/sd-bus/bus-message.c | |
| parent | 52d86690d68779b120a4380f7cc740825827fb0d (diff) | |
| download | systemd-baaa35ad706419ae5aacc11d2bece5bd8b73ee42.tar.gz | |
coccinelle: make use of SYNTHETIC_ERRNO
Ideally, coccinelle would strip unnecessary braces too. But I do not see any
option in coccinelle for this, so instead, I edited the patch text using
search&replace to remove the braces. Unfortunately this is not fully automatic,
in particular it didn't deal well with if-else-if-else blocks and ifdefs, so
there is an increased likelikehood be some bugs in such spots.
I also removed part of the patch that coccinelle generated for udev, where we
returns -1 for failure. This should be fixed independently.
Diffstat (limited to 'src/libsystemd/sd-bus/bus-message.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-message.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index bd3e1f3446..e80cfc882a 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -3832,11 +3832,13 @@ static int build_struct_offsets( x = size - (n_variable * sz); offset = m->rindex + x; - if (offset < start) { - log_debug("For type %s with alignment %zu, message specifies offset %zu which is smaller than previous end %zu + alignment = %zu", - t, align, offset, previous, start); - return -EBADMSG; - } + if (offset < start) + return log_debug_errno(SYNTHETIC_ERRNO(EBADMSG), + "For type %s with alignment %zu, message specifies offset %zu which is smaller than previous end %zu + alignment = %zu", + t, align, + offset, + previous, + start); } else /* Fixed size */ offset = start + k; |