Skip to content

Commit

Permalink
net/eth: Add an assert() and invert if() statement to simplify code
Browse files Browse the repository at this point in the history
To simplify the function body, invert the if() statement, returning
earlier.
Since we already checked there is enough data in the iovec buffer,
simply add an assert() call to consume the bytes_read variable.

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
  • Loading branch information
philmd authored and jasowang committed Mar 22, 2021
1 parent 7d6a4f1 commit c7274b5
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions net/eth.c
Expand Up @@ -416,15 +416,14 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags,
bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset,
&rt_hdr, sizeof(rt_hdr));
assert(bytes_read == sizeof(rt_hdr));

if ((rt_hdr.rtype == 2) && (rt_hdr.segleft == 1)) {
bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset + sizeof(rt_hdr),
dst_addr, sizeof(*dst_addr));

return bytes_read == sizeof(*dst_addr);
if ((rt_hdr.rtype != 2) || (rt_hdr.segleft != 1)) {
return false;
}
bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset + sizeof(rt_hdr),
dst_addr, sizeof(*dst_addr));
assert(bytes_read == sizeof(*dst_addr));

return false;
return true;
}

static bool
Expand Down

0 comments on commit c7274b5

Please sign in to comment.