From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Thu, 18 Jun 2020 11:33:04 +0000 (+0200)
Subject: rpcapd: Simplify a condition
X-Git-Tag: libpcap-1.10-bp~97
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/1b9542d0aace762fbee95e142c16df6d4dbc961b

rpcapd: Simplify a condition

rpcapd/daemon.c:750:47: style: The condition 'session==NULL ||
session!=NULL && session->sockdata==0' is equivalent to
'session==NULL || session->sockdata==0'. [redundantCondition]
  if ((!pars.isactive) &&  ((session == NULL) || ((session != NULL) &&
      (session->sockdata == 0))))
                                              ^
---

diff --git a/rpcapd/daemon.c b/rpcapd/daemon.c
index a0ca1a86..67c61e55 100644
--- a/rpcapd/daemon.c
+++ b/rpcapd/daemon.c
@@ -747,7 +747,7 @@ daemon_serviceloop(SOCKET sockctrl, int isactive, char *passiveClients,
 		//
 		// Be carefully: the capture can have been started, but an error occurred (so session != NULL, but
 		//  sockdata is 0
-		if ((!pars.isactive) &&  ((session == NULL) || ((session != NULL) && (session->sockdata == 0))))
+		if ((!pars.isactive) && (session == NULL || session->sockdata == 0))
 		{
 			// Check for the initial timeout
 			FD_ZERO(&rfds);