More linting in src/floppy

src/floppy/fdc.c

@@ -168,7 +168,7 @@ fdc_card_has_config(int card)
     return (device_has_config(fdc_cards[card].device) ? 1 : 0);
 }
 
-char *
+const char *
 fdc_card_get_internal_name(int card)
 {
     return device_get_internal_name(fdc_cards[card].device);
@@ -180,7 +180,7 @@ fdc_card_get_from_internal_name(char *s)
     int c = 0;
 
     while (fdc_cards[c].device != NULL) {
-        if (!strcmp((char *) fdc_cards[c].device->internal_name, s))
+        if (!strcmp(fdc_cards[c].device->internal_name, s))
             return c;
         c++;
     }

src/floppy/fdd.c

@@ -454,7 +454,7 @@ fdd_load(int drive, char *fn)
     int         c = 0;
     int         size;
     const char *p;
-    FILE *      f;
+    FILE *      fp;
 
     fdd_log("FDD: loading drive %d with '%s'\n", drive, fn);
 
@@ -463,12 +463,12 @@ fdd_load(int drive, char *fn)
     p = path_get_extension(fn);
     if (!p)
         return;
-    f = plat_fopen(fn, "rb");
-    if (f) {
-        if (fseek(f, -1, SEEK_END) == -1)
+    fp = plat_fopen(fn, "rb");
+    if (fp) {
+        if (fseek(fp, -1, SEEK_END) == -1)
             fatal("fdd_load(): Error seeking to the end of the file\n");
-        size = ftell(f) + 1;
-        fclose(f);
+        size = ftell(fp) + 1;
+        fclose(fp);
         while (loaders[c].ext) {
             if (!strcasecmp(p, (char *) loaders[c].ext) && (size == loaders[c].size || loaders[c].size == -1)) {
                 driveloaders[drive] = c;

src/floppy/fdd_86f.c

@@ -3007,24 +3007,24 @@ d86f_seek(int drive, int track)
 }
 
 void
-d86f_write_track(int drive, FILE **f, int side, uint16_t *da0, uint16_t *sa0)
+d86f_write_track(int drive, FILE **fp, int side, uint16_t *da0, uint16_t *sa0)
 {
     uint32_t array_size      = d86f_get_array_size(drive, side, 0);
     uint16_t side_flags      = d86f_handler[drive].side_flags(drive);
     uint32_t extra_bit_cells = d86f_handler[drive].extra_bit_cells(drive, side);
     uint32_t index_hole_pos  = d86f_handler[drive].index_hole_pos(drive, side);
 
-    fwrite(&side_flags, 1, 2, *f);
+    fwrite(&side_flags, 1, 2, *fp);
 
     if (d86f_has_extra_bit_cells(drive))
-        fwrite(&extra_bit_cells, 1, 4, *f);
+        fwrite(&extra_bit_cells, 1, 4, *fp);
 
-    fwrite(&index_hole_pos, 1, 4, *f);
+    fwrite(&index_hole_pos, 1, 4, *fp);
 
-    fwrite(da0, 1, array_size, *f);
+    fwrite(da0, 1, array_size, *fp);
 
     if (d86f_has_surface_desc(drive))
-        fwrite(sa0, 1, array_size, *f);
+        fwrite(sa0, 1, array_size, *fp);
 }
 
 int
@@ -3047,7 +3047,7 @@ d86f_set_cur_track(int drive, int track)
 }
 
 void
-d86f_write_tracks(int drive, FILE **f, uint32_t *track_table)
+d86f_write_tracks(int drive, FILE **fp, uint32_t *track_table)
 {
     d86f_t   *dev = d86f[drive];
     int       sides;
@@ -3077,13 +3077,13 @@ d86f_write_tracks(int drive, FILE **f, uint32_t *track_table)
                     logical_track = dev->cur_track + thin_track;
 
                 if (track_table && !tbl[logical_track]) {
-                    fseek(*f, 0, SEEK_END);
-                    tbl[logical_track] = ftell(*f);
+                    fseek(*fp, 0, SEEK_END);
+                    tbl[logical_track] = ftell(*fp);
                 }
 
                 if (tbl[logical_track]) {
-                    fseek(*f, tbl[logical_track], SEEK_SET);
-                    d86f_write_track(drive, f, side, dev->thin_track_encoded_data[thin_track][side], dev->thin_track_surface_data[thin_track][side]);
+                    fseek(*fp, tbl[logical_track], SEEK_SET);
+                    d86f_write_track(drive, fp, side, dev->thin_track_encoded_data[thin_track][side], dev->thin_track_surface_data[thin_track][side]);
                 }
             }
         }
@@ -3096,14 +3096,14 @@ d86f_write_tracks(int drive, FILE **f, uint32_t *track_table)
                 logical_track = dev->cur_track;
 
             if (track_table && !tbl[logical_track]) {
-                fseek(*f, 0, SEEK_END);
-                tbl[logical_track] = ftell(*f);
+                fseek(*fp, 0, SEEK_END);
+                tbl[logical_track] = ftell(*fp);
             }
 
             if (tbl[logical_track]) {
-                if (fseek(*f, tbl[logical_track], SEEK_SET) == -1)
+                if (fseek(*fp, tbl[logical_track], SEEK_SET) == -1)
                     fatal("d86f_write_tracks(): Error seeking to offset tbl[logical_track]\n");
-                d86f_write_track(drive, f, side, d86f_handler[drive].encoded_data(drive, side), dev->track_surface_data[side]);
+                d86f_write_track(drive, fp, side, d86f_handler[drive].encoded_data(drive, side), dev->track_surface_data[side]);
             }
         }
     }

src/floppy/fdi2raw.c

@@ -1503,12 +1503,12 @@ dumpstream(UNUSED(int track), UNUSED(uint8_t *stream), UNUSED(int len))
 {
 #if 0
     char name[100];
-    FILE *f;
+    FILE *fp;
 
     sprintf (name, "track_%d.raw", track);
-    f = fopen(name, "wb");
-    fwrite (stream, 1, len * 4, f);
-    fclose (f);
+    fp = fopen(name, "wb");
+    fwrite (stream, 1, len * 4, fp);
+    fclose (fp);
 #endif
 }
 
@@ -2162,7 +2162,7 @@ fdi2raw_get_tpi(FDI *fdi)
 }
 
 FDI *
-fdi2raw_header(FILE *f)
+fdi2raw_header(FILE *fp)
 {
     long    i;
     long    offset;
@@ -2174,7 +2174,7 @@ fdi2raw_header(FILE *f)
     fdi2raw_log("ALLOC: memory allocated %d\n", fdi_allocated);
     fdi = fdi_malloc(sizeof(FDI));
     memset(fdi, 0, sizeof(FDI));
-    fdi->file = f;
+    fdi->file = fp;
     oldseek   = ftell(fdi->file);
     if (oldseek == -1) {
         fdi_free(fdi);