refactor(fdc): silenced some warnings from clang-tidy

Author: giuliof

src/fdc.c

@@ -556,8 +556,8 @@ static void post_exec_format_track(void) {
 
     // At the moment the track format is just a writing over all "pre-formatted"
     // sectors. An arbitrary format is currently not supported.
-    for (size_t s = 0; s < format_args->sec_per_track; s++) {
-        uint8_t *id_field = exec_buffer + (4 * s);
+    for (size_t sec = 0; sec < format_args->sec_per_track; sec++) {
+        uint8_t *id_field = exec_buffer + (4 * sec);
         uint8_t cylinder = id_field[0];
         uint8_t head = id_field[1];
         uint8_t record = id_field[2] - 1;
@@ -619,24 +619,26 @@ static void pre_exec_seek(void) {
 /* * * * * * * * * * * * * * *  Utility routines  * * * * * * * * * * * * * * */
 
 static bool is_cmd_out_of_sequence(uint8_t cmd) {
+    bool ret = true;
+
     bool fdc_busy = status_register[MSR] &
                     ((FDC_ST_D3B | FDC_ST_D2B | FDC_ST_D1B | FDC_ST_D0B));
 
     if (cmd == FDC_SEEK || cmd == FDC_RECALIBRATE)
-        return false;
-    // TODO: to be correct, I should check int, but it was already
+        ret = false;
+    // TODO(giuliof): to be correct, I should check int, but it was already
     // cleared in command read/write routine
     else if (cmd == FDC_SENSE_INTERRUPT) {
         if (fdc_busy)
-            return false;
+            ret = false;
     }
     //
     else {
         if (!fdc_busy)
-            return false;
+            ret = false;
     }
 
-    return true;
+    return ret;
 }
 
 static void fdc_compute_next_status(void) {

src/tests/test_fdc.c

@@ -3,7 +3,7 @@
 #include <criterion/parameterized.h>
 #include <stdio.h>
 
-// TODO source path is src!
+// TODO(giuliof) source path is src!
 #include "../fdc.h"
 #include "../fdc_registers.h"
 
@@ -22,12 +22,13 @@ static int fake_write(uint8_t *buffer, uint8_t unit_number, bool phy_head,
  * @param expected_sr the expected value of the FDC main status register
  */
 static void assert_fdc_sr(uint8_t expected_sr) {
-    uint8_t sr;
-    sr = fdc_in(FDC_ADDR_STATUS_REGISTER);
-    // cr_log_info("%x != %x", sr, expected_sr);
-    cr_expect_eq(sr, expected_sr);
+    uint8_t sreg;
+    sreg = fdc_in(FDC_ADDR_STATUS_REGISTER);
+    // cr_log_info("%x != %x", sreg, expected_sr);
+    cr_expect_eq(sreg, expected_sr);
 }
 
+// NOLINTNEXTLINE
 static int fake_read(uint8_t *buffer, uint8_t unit_number, bool phy_head,
                      uint8_t phy_track, bool head, uint8_t track,
                      uint8_t sector) {
@@ -42,6 +43,7 @@ static int fake_read(uint8_t *buffer, uint8_t unit_number, bool phy_head,
     return 4;
 }
 
+// NOLINTNEXTLINE
 static int fake_wrong_rw(uint8_t *buffer, uint8_t unit_number, bool phy_head,
                          uint8_t phy_track, bool head, uint8_t track,
                          uint8_t sector) {
@@ -56,6 +58,7 @@ static int fake_wrong_rw(uint8_t *buffer, uint8_t unit_number, bool phy_head,
     return DISK_IMAGE_ERR;
 }
 
+// NOLINTNEXTLINE
 static int fake_read_check_track(uint8_t *buffer, uint8_t unit_number,
                                  bool phy_head, uint8_t phy_track, bool head,
                                  uint8_t track, uint8_t sector) {
@@ -173,11 +176,11 @@ Test(ceda_fdc, invalidSeekSequence) {
     cr_assert_eq(fdc_getIntStatus(), false);
 
     {
-        uint8_t sr;
-        sr = fdc_in(FDC_ADDR_STATUS_REGISTER);
+        uint8_t sreg;
+        sreg = fdc_in(FDC_ADDR_STATUS_REGISTER);
         // Remove busy drives, not interested
-        sr &= (uint8_t) ~(FDC_ST_D0B | FDC_ST_D1B | FDC_ST_D2B | FDC_ST_D3B);
-        cr_expect_eq(sr, (FDC_ST_RQM | FDC_ST_DIO | FDC_ST_CB));
+        sreg &= (uint8_t) ~(FDC_ST_D0B | FDC_ST_D1B | FDC_ST_D2B | FDC_ST_D3B);
+        cr_expect_eq(sreg, (FDC_ST_RQM | FDC_ST_DIO | FDC_ST_CB));
     }
 
     // FDC does not process this command and asserts invalid command