diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-10 18:04:01 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-10 18:04:01 +0100 |
commit | 4480c9f12f363741cd956ae9a314ac18cbf79448 (patch) | |
tree | 10c5e940451d4d9a8907d8750e143b19d43e1b55 /src/util/socks.c | |
parent | 71d41835b8353d7d080c2de50b0303ed6861ffba (diff) | |
download | gnunet-4480c9f12f363741cd956ae9a314ac18cbf79448.tar.gz gnunet-4480c9f12f363741cd956ae9a314ac18cbf79448.zip |
remove redundant condition in assertion
Diffstat (limited to 'src/util/socks.c')
-rw-r--r-- | src/util/socks.c | 15 |
1 files 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, | |||
372 | return 0; | 372 | return 0; |
373 | } | 373 | } |
374 | 374 | ||
375 | GNUNET_assert (1024 >= size && size > 0); | 375 | GNUNET_assert ( (1024 >= size) && (size > 0) ); |
376 | GNUNET_assert (SOCKS5_step_done > ih->step && ih->step >= 0); | 376 | GNUNET_assert ( (SOCKS5_step_done > ih->step) && (ih->step >= 0) ); |
377 | unsigned char * b = ih->outstep[ih->step]; | 377 | unsigned char * b = ih->outstep[ih->step]; |
378 | unsigned char * e = ih->outstep[ih->step+1]; | 378 | unsigned char * e = ih->outstep[ih->step+1]; |
379 | GNUNET_assert (e <= &ih->outbuf[1024]); | 379 | GNUNET_assert (e <= &ih->outbuf[1024]); |
380 | unsigned l = e - b; | 380 | unsigned int l = e - b; |
381 | GNUNET_assert (size >= l && l >= 0); | 381 | GNUNET_assert (size >= l); |
382 | GNUNET_memcpy(buf, b, l); | 382 | GNUNET_memcpy (buf, |
383 | register_reciever (ih, register_reciever_wants(ih)); | 383 | b, |
384 | l); | ||
385 | register_reciever (ih, | ||
386 | register_reciever_wants (ih)); | ||
384 | return l; | 387 | return l; |
385 | } | 388 | } |
386 | 389 | ||