[tor-commits] [tor/maint-0.2.8] Coverity hates it when we do "E1 ? E2 : E2".

[nickm at torproject.org]

commit f1973e70a45d9705d3bd547af9cee92ca3611213
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 21 14:14:33 2016 +0200

    Coverity hates it when we do "E1 ? E2 : E2".
    
    It says, 'Incorrect expression (IDENTICAL_BRANCHES)'
    
    Fix for CID 1364127. Not in any released Tor.
---
 src/common/sandbox.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 56a1cff..74187e5 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -608,7 +608,6 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
     const int pf = i ? PF_INET : PF_INET6;
     for (j=0; j < 3; ++j) {
       const int type     = (j == 0) ? SOCK_STREAM :
-                           (j == 1) ? SOCK_DGRAM :
                                       SOCK_DGRAM;
       const int protocol = (j == 0) ? IPPROTO_TCP :
                            (j == 1) ? IPPROTO_IP :