[Qemu-devel] [PATCH] slirp: Fix spurious error report when sending directly

[Qemu-devel] [PATCH] slirp: Fix spurious error report when sending directly

[Samuel Thibault]

When DEBUG is enabled, len needs to be updated.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 slirp/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slirp/socket.c b/slirp/socket.c
index e2a71c9b04..3182477ff5 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -351,7 +351,7 @@ sosendoob(struct socket *so)
 
 	if (sb->sb_rptr < sb->sb_wptr) {
 		/* We can send it directly */
-		n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */
+		len = n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */
 	} else {
 		/*
 		 * Since there's no sendv or sendtov like writev,
-- 
2.17.0

Re: [Qemu-devel] [PATCH] slirp: Fix spurious error report when sending directly

[no-reply]

Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20180531192419.4592-1-samuel.thibault@ens-lyon.org
Subject: [Qemu-devel] [PATCH] slirp: Fix spurious error report when sending directly

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]               patchew/20180531192419.4592-1-samuel.thibault@ens-lyon.org -> patchew/20180531192419.4592-1-samuel.thibault@ens-lyon.org
Switched to a new branch 'test'
70fe171239 slirp: Fix spurious error report when sending directly

=== OUTPUT BEGIN ===
Checking PATCH 1/1: slirp: Fix spurious error report when sending directly...
ERROR: line over 90 characters
#20: FILE: slirp/socket.c:354:
+		len = n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */

ERROR: code indent should never use tabs
#20: FILE: slirp/socket.c:354:
+^I^Ilen = n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */$

total: 2 errors, 0 warnings, 8 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [Qemu-devel] [PATCH] slirp: Fix spurious error report when sending directly

[Philippe Mathieu-Daudé]

Hi Samuel,

On 05/31/2018 04:24 PM, Samuel Thibault wrote:
> When DEBUG is enabled, len needs to be updated.
> 
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> ---
>  slirp/socket.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/slirp/socket.c b/slirp/socket.c
> index e2a71c9b04..3182477ff5 100644
> --- a/slirp/socket.c
> +++ b/slirp/socket.c
> @@ -351,7 +351,7 @@ sosendoob(struct socket *so)
>  
>  	if (sb->sb_rptr < sb->sb_wptr) {
>  		/* We can send it directly */
> -		n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */
> +		len = n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */
>  	} else {
>  		/*
>  		 * Since there's no sendv or sendtov like writev,
> 

Isn't it cleaner to move the DEBUG code in the else { }?

        if (sb->sb_rptr < sb->sb_wptr) {
            /* We can send it directly */
            n = slirp_send(...
        } else {
            ...
            n = slirp_send(...
    #ifdef DEBUG
            if (n != len) {
                DEBUG_ERROR("Didn't send all data urgently ...
            }
    #endif
        }