From 4480c9f12f363741cd956ae9a314ac18cbf79448 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 10 Mar 2017 18:04:01 +0100 Subject: [PATCH] remove redundant condition in assertion --- src/util/socks.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/util/socks.c b/src/util/socks.c index 37e60e3e4..8c32eff4f 100644 --- a/src/util/socks.c +++ b/src/util/socks.c @@ -372,15 +372,18 @@ transmit_ready (void *cls, return 0; } - GNUNET_assert (1024 >= size && size > 0); - GNUNET_assert (SOCKS5_step_done > ih->step && ih->step >= 0); + GNUNET_assert ( (1024 >= size) && (size > 0) ); + GNUNET_assert ( (SOCKS5_step_done > ih->step) && (ih->step >= 0) ); unsigned char * b = ih->outstep[ih->step]; unsigned char * e = ih->outstep[ih->step+1]; GNUNET_assert (e <= &ih->outbuf[1024]); - unsigned l = e - b; - GNUNET_assert (size >= l && l >= 0); - GNUNET_memcpy(buf, b, l); - register_reciever (ih, register_reciever_wants(ih)); + unsigned int l = e - b; + GNUNET_assert (size >= l); + GNUNET_memcpy (buf, + b, + l); + register_reciever (ih, + register_reciever_wants (ih)); return l; } -- 2.25.1