From 73b67b5c6623f1239f3f08eea88370951426fb08 Mon Sep 17 00:00:00 2001
From: Xael South <xael.south@yandex.com>
Date: Sat, 6 Feb 2021 12:01:52 +0000
Subject: [PATCH] s1 decoder small fixes

---
 s1_packet_decoder.h | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/s1_packet_decoder.h b/s1_packet_decoder.h
index a9c4643..3ffd873 100644
--- a/s1_packet_decoder.h
+++ b/s1_packet_decoder.h
@@ -160,13 +160,12 @@ static void s1_rx_bit2(unsigned bit, struct s1_packet_decoder_work *decoder)
     if (b == 0xFFu)
     {
         reset_s1_packet_decoder(decoder);
+        return;
     }
-    else
-    {
-        decoder->byte >>= 2;
-        decoder->byte <<= 1;
-        decoder->byte |= b;
-    }
+
+    decoder->byte >>= 2;
+    decoder->byte <<= 1;
+    decoder->byte |= b;
 }
 
 static void s1_rx_first_lfield_bit(unsigned bit, struct s1_packet_decoder_work *decoder)
@@ -185,13 +184,12 @@ static void s1_rx_last_lfield_bit(unsigned bit, struct s1_packet_decoder_work *d
     if (b == 0xFFu)
     {
         reset_s1_packet_decoder(decoder);
+        return;
     }
-    else
-    {
-        decoder->byte >>= 2;
-        decoder->byte <<= 1;
-        decoder->byte |= b;
-    }
+
+    decoder->byte >>= 2;
+    decoder->byte <<= 1;
+    decoder->byte |= b;
 
     decoder->L = decoder->byte;
     decoder->l = 0;
@@ -214,13 +212,12 @@ static void s1_rx_last_data_bit(unsigned bit, struct s1_packet_decoder_work *dec
     if (b == 0xFFu)
     {
         reset_s1_packet_decoder(decoder);
+        return;
     }
-    else
-    {
-        decoder->byte >>= 2;
-        decoder->byte <<= 1;
-        decoder->byte |= b;
-    }
+
+    decoder->byte >>= 2;
+    decoder->byte <<= 1;
+    decoder->byte |= b;
 
     decoder->packet[decoder->l++] = decoder->byte;