Skip to contentSkip to conversation

socket: remove duplicate expression

PATCH In review Yegor Yefremov 3 participants 3 messages Nov 22, 2014 – Nov 23, 2014

lore
Share & tools
lore

Yegor Yefremov

author
#0 lore raw

PATCH 1/1 socket: remove duplicate expression

Found via cppcheck and compile-tested.

Signed-off-by Yegor Yefremov <[email protected]...>
---
 src/openvpn/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/socket.c +1 -1
index 29f9958..331a9d9 100644
@@ -2666,7 +2666,7 @@ proto_is_tcp(int proto)
 {
   if (proto < 0 || proto >= PROTO_N)
     ASSERT(0);
-  return proto == PROTO_TCP_CLIENT || proto == PROTO_TCP_SERVER || proto == PROTO_TCP_CLIENT;
+  return proto == PROTO_TCP_CLIENT || proto == PROTO_TCP_SERVER;
 }
 
 int
Signature · 1 line
1.8.3.2
#1 lore raw

Am 22.11.14 21:13, schrieb Yegor Yefremov:

Quoted 12 lines

Found via cppcheck and compile-tested.

Signed-off-by Yegor Yefremov <[email protected]...>
---
 src/openvpn/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/socket.c +0 -0
index 29f9958..331a9d9 100644

src/openvpn/socket.c proto_is_tcp(int proto) · line 2672

Quoted 8 lines
src/openvpn/socket.c +1 -1
@@ -2666,7 +2666,7 @@ proto_is_tcp(int proto)
 {
   if (proto < 0 || proto >= PROTO_N)
     ASSERT(0);
-  return proto == PROTO_TCP_CLIENT || proto == PROTO_TCP_SERVER || proto == PROTO_TCP_CLIENT;
+  return proto == PROTO_TCP_CLIENT || proto == PROTO_TCP_SERVER;
 }
 
 int

ACK, probably my mistake.

Arne

#2 lore raw
In reply to Yegor Yefremov

ACK (obviously correct, Arne just beat me to it).

Your patch has been applied to the master branch.

commit d0ce829fbc2b3656c433e14f2c1c1b3db3b069c7 (master)

Author: Yegor Yefremov
Date:   Sat Nov 22 21:13:35 2014 +0100
     socket: remove duplicate expression

     Signed-off-by: Yegor Yefremov <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/9263
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering