Use const pointers args in functions, no names for unused function args (#138)

Author: FozzTexx

.gitignore

@@ -1,9 +1,9 @@
 *.bin
-*.c~
+*~
 *.cas
 *.d88
-*.h~
 *.swp
+*.err
 .vscode/
 .vscode/c_cpp_properties.json
 .vscode/settings.json
@@ -13,6 +13,8 @@ autorun
 autorun.atr
 autorun.rmm
 build
+_cache
+r2r
 config
 config.com
 config.com.lbl

src/adam/screen.h

@@ -38,18 +38,18 @@ void screen_hosts_and_devices_edit_host_slot(unsigned char i);
 void screen_hosts_and_devices_eject(unsigned char ds);
 void screen_hosts_and_devices_host_slot_empty(unsigned char hs);
 
-void screen_hosts_and_devices_long_filename(char *f);
+void screen_hosts_and_devices_long_filename(const char *f);
 
 void screen_show_info(bool printerEnabled,AdapterConfig* ac);
 
 void screen_select_file(void);
 void screen_select_file_display(char *p, char *f);
-void screen_select_file_display_long_filename(char *e);
+void screen_select_file_display_long_filename(const char *e);
 void screen_select_file_clear_long_filename(void);
 void screen_select_file_filter(void);
 void screen_select_file_next(void);
 void screen_select_file_prev(void);
-void screen_select_file_display_entry(unsigned char y, char* e, unsigned entryType);
+void screen_select_file_display_entry(unsigned char y, const char* e, unsigned entryType);
 void screen_select_file_choose(char visibleEntries);
 void screen_select_file_new_type(void);
 void screen_select_file_new_size(unsigned char k);

src/apple2/screen.c

@@ -344,7 +344,7 @@ const char* screen_hosts_and_devices_device_slot(unsigned char hs, bool e, char
     return &empty[0];
 }
 
-char* screen_hosts_and_devices_slot(char *c)
+const char* screen_hosts_and_devices_slot(const char *c)
 {
   return c[0]==0x00 ? empty : c;
 }
@@ -561,7 +561,7 @@ void screen_select_file_prev(void)
 }
 
 #pragma warn (unused-param, push, off)
-void screen_select_file_display_long_filename(char *e)
+void screen_select_file_display_long_filename(const char *e)
 {
   // it wasn't this.
   /* gotoxy(0,19); */
@@ -575,7 +575,7 @@ void screen_select_file_next(void)
 }
 
 #pragma warn (unused-param, push, off)
-void screen_select_file_display_entry(unsigned char y, char* e, unsigned entryType)
+void screen_select_file_display_entry(unsigned char y, const char* e, unsigned entryType)
 {
   gotoxy(0,y+3);
   cprintf("%-40s",&e[2]); // skip the first two chars from FN (hold over from Adam)
@@ -693,7 +693,7 @@ void screen_select_file_new_name(void)
   screen_print_menu(" New media: Enter filename \r\n","");
 }
 
-void screen_hosts_and_devices_long_filename(char *f)
+void screen_hosts_and_devices_long_filename(const char *f)
 {
   // TODO: implement
   if (strlen(f)>31)

src/apple2/screen.h

@@ -54,14 +54,14 @@ void screen_select_file_filter(void);
 void screen_select_file_next(void);
 void screen_select_file_new_type(void);
 void screen_select_file_prev(void);
-void screen_select_file_display_long_filename(char *e);
-void screen_select_file_display_entry(unsigned char y, char* e, unsigned entryType);
+void screen_select_file_display_long_filename(const char *e);
+void screen_select_file_display_entry(unsigned char y, const char* e, unsigned entryType);
 void screen_select_file_clear_long_filename(void);
 void screen_select_file_choose(char visibleEntries);
 void screen_select_file_new_size(unsigned char k);
 void screen_select_file_new_custom(void);
 void screen_select_file_new_name(void);
-void screen_hosts_and_devices_long_filename(char *f);
+void screen_hosts_and_devices_long_filename(const char *f);
 void screen_hosts_and_devices_devices_clear_all(void);
 void screen_select_file_new_creating(void);
 

src/atari/bar.c

@@ -15,7 +15,7 @@ static unsigned char bar_y=1;
 /**
  * Clear bar from screen
  */
-void bar_clear(bool old)
+void bar_clear(bool)
 {
   memset(bar_pmbase,0,1024);
 }
@@ -100,4 +100,4 @@ void fastcall bar_show(unsigned char y)
 }
 
 
-#endif
+#endif

src/atari/input.c

@@ -84,7 +84,7 @@ unsigned char input_handle_joystick(void)
     return 0;
 }
 
-void input_line(unsigned char x, unsigned char y, unsigned char o, char *c, unsigned char l, bool password)
+void input_line(unsigned char, unsigned char, unsigned char, char *, unsigned char, bool)
 {
 }
 
@@ -107,7 +107,7 @@ void input_line_set_wifi_password(char *c)
   edit_line(0, 21, c, 64, true);
 }
 
-void input_line_hosts_and_devices_host_slot(unsigned char i, unsigned char o, char *c)
+void input_line_hosts_and_devices_host_slot(unsigned char i, unsigned char, char *c)
 {
   edit_line(5, i + HOSTS_START_Y, c, 32, false);
 }
@@ -123,7 +123,7 @@ unsigned char input_select_file_new_type(void)
   return 1;
 }
 
-unsigned long input_select_file_new_size(unsigned char t)
+unsigned long input_select_file_new_size(unsigned char)
 {
   char temp[8];
   memset(temp, 0, sizeof(temp));
@@ -198,9 +198,10 @@ void input_select_file_new_name(char *c)
 
 bool input_select_slot_build_eos_directory(void)
 {
+  return false;
 }
 
-void input_select_slot_build_eos_directory_label(char *c)
+void input_select_slot_build_eos_directory_label(char *)
 {
 }
 
@@ -345,13 +346,13 @@ HDSubState input_hosts_and_devices_hosts(void)
     return HD_HOSTS;
   case KCODE_RETURN:
     selected_host_slot = bar_get() - HOSTS_START_Y;
-    if ( !wifiEnabled && strcmp(hostSlots[selected_host_slot],"SD") != 0) // Don't go in a TNFS host if wifi is disabled.
+    if ( !wifiEnabled && strcmp((char *) hostSlots[selected_host_slot],"SD") != 0) // Don't go in a TNFS host if wifi is disabled.
     {
       return HD_HOSTS;
     }
     if (hostSlots[selected_host_slot][0] != 0)
     {
-      strcpy(selected_host_name, hostSlots[selected_host_slot]);
+      strcpy(selected_host_name, (char *) hostSlots[selected_host_slot]);
       state = SELECT_FILE;
       return HD_DONE;
     }
@@ -433,13 +434,13 @@ HDSubState input_hosts_and_devices_devices(void)
     // set device mode to read
     selected_device_slot = bar_get() - DEVICES_START_Y;
     hosts_and_devices_devices_set_mode(MODE_READ);
-    screen_hosts_and_devices_device_slots(DEVICES_START_Y, &deviceSlots[0], "");
+    screen_hosts_and_devices_device_slots(DEVICES_START_Y, &deviceSlots[0], (bool *) "");
     return HD_DEVICES;
   case 'W':
     // set device mode to write
     selected_device_slot = bar_get() - DEVICES_START_Y;
     hosts_and_devices_devices_set_mode(MODE_WRITE);
-    screen_hosts_and_devices_device_slots(DEVICES_START_Y, &deviceSlots[0], "");
+    screen_hosts_and_devices_device_slots(DEVICES_START_Y, &deviceSlots[0], (bool *) "");
     return HD_DEVICES;
   case 'C':
     state = SHOW_INFO;

src/atari/io.c

@@ -37,6 +37,7 @@ bool io_error(void)
 
 unsigned char io_status(void)
 {
+  return 0;
 }
 
 void io_init(void)
@@ -156,16 +157,16 @@ void io_open_directory(unsigned char hs, char *p, char *f)
     memset(response, 0, 256);
     strcpy(response, p);
     strcpy(&response[strlen(response) + 1], f);
-    _p = &response;
+    _p = response;
   }
   fuji_open_directory(hs, _p);
 }
 
 char *io_read_directory(unsigned char maxlen, unsigned char a)
 {
   memset(response, 0, maxlen);
-  fuji_read_directory(maxlen, a, &response);
-  return &response;
+  fuji_read_directory(maxlen, a, response);
+  return response;
 }
 
 void io_close_directory(void)
@@ -185,8 +186,8 @@ void io_set_device_filename(unsigned char ds, unsigned char hs, unsigned char mo
 
 char *io_get_device_filename(unsigned char slot)
 {
-  fuji_get_device_filename(slot, &response);
-  return &response;
+  fuji_get_device_filename(slot, response);
+  return response;
 }
 
 void io_set_boot_config(unsigned char toggle)
@@ -260,11 +261,11 @@ void io_create_new(unsigned char selected_host_slot, unsigned char selected_devi
 
 }
 
-void io_build_directory(unsigned char ds, unsigned long numBlocks, char *v)
+void io_build_directory(unsigned char, unsigned long, char *)
 {
 }
 
-bool io_get_device_enabled_status(unsigned char d)
+bool io_get_device_enabled_status(unsigned char)
 {
   // adam calls $D1, which doesn't exist in atari.
   return false;
@@ -281,11 +282,11 @@ void io_update_devices_enabled(bool *e)
   }
 }
 
-void io_enable_device(unsigned char d)
+void io_enable_device(unsigned char)
 {
 }
 
-void io_disable_device(unsigned char d)
+void io_disable_device(unsigned char)
 {
 }
 
@@ -296,11 +297,12 @@ void io_disable_device(unsigned char d)
 void io_copy_file(unsigned char source_slot, unsigned char destination_slot)
 {
   // incrementing is handled in function, we keep everything 0 based
-  fuji_copy_file(source_slot, destination_slot, &copySpec);
+  fuji_copy_file(source_slot, destination_slot, copySpec);
 }
 
-unsigned char io_device_slot_to_device(unsigned char ds)
+unsigned char io_device_slot_to_device(unsigned char)
 {
+  return 0;
 }
 
 /**