From: Philippe Antoine <pantoine@oisf.net>
Date: Wed, 6 Jul 2022 13:27:10 +0000 (+0200)
Subject: threads: cleaner code with one instruction per line
X-Git-Tag: suricata-7.0.0-beta1~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adeb1fdfc32f5ec2e98dcce01010e0304983508f;p=thirdparty%2Fsuricata.git

threads: cleaner code with one instruction per line

As reported by Shchelk
---

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 80915f33dd..7bd6cfa8bc 100644
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -175,9 +175,9 @@ static int TmThreadTimeoutLoop(ThreadVars *tv, TmSlot *s)
                 Packet *p = PacketDequeue(tv->stream_pq);
                 SCMutexUnlock(&tv->stream_pq->mutex_q);
                 if (likely(p)) {
-                    if ((r = TmThreadsSlotProcessPkt(tv, fw_slot, p) != TM_ECODE_OK)) {
-                        if (r == TM_ECODE_FAILED)
-                            break;
+                    r = TmThreadsSlotProcessPkt(tv, fw_slot, p);
+                    if (r == TM_ECODE_FAILED) {
+                        break;
                     }
                 }
             }