From 9cda2442275e4d2d6a53e768d6d2fcddaeb16454 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Wed, 17 May 2023 03:09:01 -0400
Subject: [PATCH] Some sonarlint work

---
 src/acpi.c                | 6 ++++--
 src/chipset/intel_815ep.c | 6 ++++--
 src/include/86box/smbus.h | 9 ++++++---
 src/sio/sio_w83627hf.c    | 6 +++++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/acpi.c b/src/acpi.c
index 33c90c483..e105f4794 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -405,7 +405,8 @@ acpi_reg_read_intel_ich2(int size, uint16_t addr, void *p)
 {
     acpi_t  *dev = (acpi_t *) p;
     uint32_t ret = 0x00000000;
-    int      shift16, shift32;
+    int      shift16;
+    int      shift32;
 
     addr &= 0x7f;
     shift16 = (addr & 1) << 3;
@@ -1018,7 +1019,8 @@ static void
 acpi_reg_write_intel_ich2(int size, uint16_t addr, uint8_t val, void *p)
 {
     acpi_t *dev = (acpi_t *) p;
-    int     shift16, shift32;
+    int     shift16;
+    int     shift32;
 
     addr &= 0x7f;
 #ifdef ENABLE_ACPI_LOG
diff --git a/src/chipset/intel_815ep.c b/src/chipset/intel_815ep.c
index 6d15d5d0f..f07f2e7f9 100644
--- a/src/chipset/intel_815ep.c
+++ b/src/chipset/intel_815ep.c
@@ -65,8 +65,10 @@ typedef struct intel_815ep_t {
 static void
 intel_815ep_agp_aperature(intel_815ep_t *dev)
 {
-    uint32_t aperature_base, aperature_size_calc;
-    int      aperature_size, aperature_enable;
+    uint32_t aperature_base;
+    uint32_t aperature_size_calc;
+    int      aperature_size;
+    int      aperature_enable;
 
     aperature_base      = dev->pci_conf[0x13] << 24;
     aperature_size      = !!(dev->pci_conf[0xb4] & 8);
diff --git a/src/include/86box/smbus.h b/src/include/86box/smbus.h
index 4bc7410a8..35ba85edf 100644
--- a/src/include/86box/smbus.h
+++ b/src/include/86box/smbus.h
@@ -36,13 +36,16 @@ enum {
 
 typedef struct {
     uint32_t local;
-    uint16_t io_base, byte_rw;
+    uint16_t io_base;
+    uint16_t byte_rw;
     int      clock;
     double   bit_period;
     uint8_t  stat, next_stat, ctl, cmd, addr,
         data0, data1,
-        index, data[SMBUS_PIIX4_BLOCK_DATA_SIZE], block_data_byte,
-        irq, smi_en;
+        index, data[SMBUS_PIIX4_BLOCK_DATA_SIZE];
+    uint8_t  block_data_byte;
+    uint8_t  irq;
+    uint8_t  smi_en;
     acpi_t    *acpi;
     pc_timer_t response_timer;
     void      *i2c;
diff --git a/src/sio/sio_w83627hf.c b/src/sio/sio_w83627hf.c
index 94fd6e377..63eba302f 100644
--- a/src/sio/sio_w83627hf.c
+++ b/src/sio/sio_w83627hf.c
@@ -136,7 +136,11 @@ typedef struct
 } w83627hf_t;
 
 /* These differ per board and must be programmed manually */
-int fan1_rpm, fan2_rpm, fan3_rpm, vcorea_voltage, vcoreb_voltage;
+int fan1_rpm;
+int fan2_rpm;
+int fan3_rpm;
+int vcorea_voltage;
+int vcoreb_voltage;
 
 void
 w83627hf_stabilizer(int vcoreb, int fan1, int fan2, int fan3)