[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 3/6] hw/net/rtl8139: Simplify if/else statement
From: |
Alistair Francis |
Subject: |
Re: [PATCH 3/6] hw/net/rtl8139: Simplify if/else statement |
Date: |
Thu, 5 Mar 2020 10:49:44 -0800 |
On Thu, Mar 5, 2020 at 9:59 AM Philippe Mathieu-Daudé <address@hidden> wrote:
>
> Rewrite:
>
> if (E) {
> return A;
> } else {
> return B;
> }
> /* EOF */
> }
>
> as:
>
> if (E) {
> return A;
> }
> return B;
> }
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Alistair
> ---
> hw/net/rtl8139.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
> index ae4739bc09..ef3211537f 100644
> --- a/hw/net/rtl8139.c
> +++ b/hw/net/rtl8139.c
> @@ -808,11 +808,11 @@ static int rtl8139_can_receive(NetClientState *nc)
> /* ??? Flow control not implemented in c+ mode.
> This is a hack to work around slirp deficiencies anyway. */
> return 1;
> - } else {
> - avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr,
> - s->RxBufferSize);
> - return (avail == 0 || avail >= 1514 || (s->IntrMask & RxOverflow));
> }
> +
> + avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr,
> + s->RxBufferSize);
> + return avail == 0 || avail >= 1514 || (s->IntrMask & RxOverflow);
> }
>
> static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf,
> size_t size_, int do_interrupt)
> --
> 2.21.1
>
>
- [PATCH 0/6] hw/net: Make Net/CanBus can_receive() handlers return a boolean, Philippe Mathieu-Daudé, 2020/03/05
- [PATCH 1/6] hw/net/e1000e_core: Let e1000e_can_receive() return a boolean, Philippe Mathieu-Daudé, 2020/03/05
- [PATCH 3/6] hw/net/rtl8139: Simplify if/else statement, Philippe Mathieu-Daudé, 2020/03/05
- [PATCH 2/6] hw/net/smc91c111: Let smc91c111_can_receive() return a boolean, Philippe Mathieu-Daudé, 2020/03/05
- [PATCH 4/6] hw/net/rtl8139: Update coding style to make checkpatch.pl happy, Philippe Mathieu-Daudé, 2020/03/05
- [PATCH 5/6] hw/net: Make NetCanReceive() return a boolean, Philippe Mathieu-Daudé, 2020/03/05