Add "const" qualifiers to all targets to fix generating a release (#26)

markjfisher · web-flow · commit d38ab1d2614d · 2025-04-18T17:25:48.000+01:00
diff --git a/adam/src/fn_network/network_close.c b/adam/src/fn_network/network_close.c
@@ -3,7 +3,7 @@
 #include <eos.h>
 #include "fujinet-network.h"
 
-uint8_t network_close(char* devicespec)
+uint8_t network_close(const char* devicespec)
 {
     unsigned char u = network_unit_adamnet(devicespec);
 
diff --git a/adam/src/fn_network/network_http_set_channel_mode.c b/adam/src/fn_network/network_http_set_channel_mode.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include "fujinet-network.h"
 
-uint8_t network_http_set_channel_mode(char *devicespec, uint8_t mode)
+uint8_t network_http_set_channel_mode(const char *devicespec, uint8_t mode)
 {
 	return 0;
 }
diff --git a/adam/src/fn_network/network_ioctl.c b/adam/src/fn_network/network_ioctl.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include "fujinet-network.h"
 
-uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, char* devicespec, ...)
+uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, const char* devicespec, ...)
 {
 	return 0;
 }
diff --git a/adam/src/fn_network/network_json_parse.c b/adam/src/fn_network/network_json_parse.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include "fujinet-network.h"
 
-uint8_t network_json_parse(char *devicespec)
+uint8_t network_json_parse(const char *devicespec)
 {
 	return 0;
 }
diff --git a/adam/src/fn_network/network_json_query.c b/adam/src/fn_network/network_json_query.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include "fujinet-network.h"
 
-int16_t network_json_query(char *devicespec, char *query, char *s)
+int16_t network_json_query(const char *devicespec, const char *query, char *s)
 {
 	return 0;
 }
diff --git a/adam/src/fn_network/network_open.c b/adam/src/fn_network/network_open.c
@@ -11,7 +11,7 @@
  * @param trans Translation mode 0 = none ...
  * @return FN_error code.
  */
-uint8_t network_open(char* devicespec, uint8_t mode, uint8_t trans)
+uint8_t network_open(const char* devicespec, uint8_t mode, uint8_t trans)
 {
     struct _o
     {
diff --git a/adam/src/fn_network/network_status.c b/adam/src/fn_network/network_status.c
@@ -4,7 +4,7 @@
 #include "fujinet-network.h"
 #include "fujinet-network-adam.h"
 
-uint8_t network_status(char *devicespec, uint16_t *bw, uint8_t *c, uint8_t *err)
+uint8_t network_status(const char *devicespec, uint16_t *bw, uint8_t *c, uint8_t *err)
 {
     struct _ns
     {
diff --git a/adam/src/fn_network/network_write.c b/adam/src/fn_network/network_write.c
@@ -4,7 +4,7 @@
 #include "fujinet-network.h"
 #include "fujinet-network-adam.h"
 
-uint8_t network_write(char* devicespec, uint8_t *buf, uint16_t len)
+uint8_t network_write(const char *devicespec, const uint8_t *buf, uint16_t len)
 {
     struct _w
     {
diff --git a/apple2/apple2-6502/fn_network/network_close.s b/apple2/apple2-6502/fn_network/network_close.s
@@ -10,7 +10,7 @@
         .import     _sp_nw_unit
         .import     pusha
 
-; uint8_t network_close(char* devicespec);
+; uint8_t network_close(const char* devicespec);
 ;
 ; returns 0 for ok, error code from control call for anything else.
 ; returns 1 if the sp_network isn't set, e.g. calling before calling _network_open.
diff --git a/apple2/src/fn_network/network_http_set_channel_mode.c b/apple2/src/fn_network/network_http_set_channel_mode.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include "fujinet-network.h"
 
-uint8_t network_http_set_channel_mode(char *devicespec, uint8_t mode) {
+uint8_t network_http_set_channel_mode(const char *devicespec, uint8_t mode) {
     return network_ioctl('M', 0, mode, devicespec, 1, 0, 2);
 }
diff --git a/apple2/src/fn_network/network_ioctl.c b/apple2/src/fn_network/network_ioctl.c
@@ -8,14 +8,14 @@
 extern uint8_t __argsize__;
 extern uint8_t bad_unit(void);
 
-// uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, char* devicespec, int16_t use_aux, void *buffer, uint16_t len);
+// uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, const char* devicespec, int16_t use_aux, void *buffer, uint16_t len);
 //
 // if use_aux is true (1), we put aux1/2 into payload[2,3], and any buffer will copy len bytes - 2 after it to payload[4+].
 // if use_aux is false, copy buffer to payload[2+]
 // if buffer is NULL, no copying ever done from buffer
 // len is set at payload[0,1]
 
-uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, char* devicespec, ...) {
+uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, const char* devicespec, ...) {
     va_list args;
 	uint8_t nw_device;
     uint16_t len;
diff --git a/apple2/src/fn_network/network_json_parse.c b/apple2/src/fn_network/network_json_parse.c
@@ -5,7 +5,7 @@
 
 extern uint8_t bad_unit(void);
 
-uint8_t network_json_parse(char *devicespec) {
+uint8_t network_json_parse(const char *devicespec) {
 	uint8_t err = 0;
 
 	fn_device_error = 0;
diff --git a/apple2/src/fn_network/network_json_query.c b/apple2/src/fn_network/network_json_query.c
@@ -5,7 +5,7 @@
 
 extern uint8_t bad_unit(void);
 
-int16_t network_json_query(char *devicespec, char *query, char *s) {
+int16_t network_json_query(const char *devicespec, const char *query, char *s) {
 	uint8_t err = 0;
 	uint16_t query_len = 0;
 	uint16_t read_len = 0;
diff --git a/apple2/src/fn_network/network_open.c b/apple2/src/fn_network/network_open.c
@@ -3,7 +3,7 @@
 #include "fujinet-network.h"
 #include "fujinet-bus-apple2.h"
 
-uint8_t network_open(char* devicespec, uint8_t mode, uint8_t trans) {
+uint8_t network_open(const char* devicespec, uint8_t mode, uint8_t trans) {
 	uint8_t nw_device;
 	uint16_t slen;
 	uint16_t payload_len;
diff --git a/apple2/src/fn_network/network_status.c b/apple2/src/fn_network/network_status.c
@@ -6,7 +6,7 @@
 extern uint8_t bad_unit(void);
 
 // this is often called in a tight loop, so we won't clear the payload to help performance
-uint8_t network_status(char *devicespec, uint16_t *bw, uint8_t *c, uint8_t *err) {
+uint8_t network_status(const char *devicespec, uint16_t *bw, uint8_t *c, uint8_t *err) {
 	uint8_t err_status;
 
 	if (sp_network == 0) {
diff --git a/apple2/src/fn_network/network_write.c b/apple2/src/fn_network/network_write.c
@@ -9,7 +9,7 @@ extern uint8_t bad_unit(void);
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
-uint8_t network_write(char* devicespec, uint8_t *buf, uint16_t len) {
+uint8_t network_write(const char *devicespec, const uint8_t *buf, uint16_t len) {
 	uint16_t buf_len = 0;
 	uint16_t sent_len = 0;
 	uint8_t err;
diff --git a/atari/src/fn_network/network_close.s b/atari/src/fn_network/network_close.s
@@ -11,7 +11,7 @@
         .include    "zp.inc"
         .include    "macros.inc"
 
-; uint8_t network_close(char* devicespec)
+; uint8_t network_close(const char* devicespec)
 .proc _network_close
         ldy     #$00
         sty     _fn_device_error
diff --git a/atari/src/fn_network/network_ioctl.s b/atari/src/fn_network/network_ioctl.s
@@ -13,10 +13,10 @@
         .include    "device.inc"
         .include    "macros.inc"
 
-; uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, char* devicespec, ...);
+; uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, const char* devicespec, ...);
 ;
 ; for atari this must always be called with:
-; uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, char* devicespec, [uint8_t dstats, uint16_t dbuf, uint16_t dbyt]);
+; uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, const char* devicespec, [uint8_t dstats, uint16_t dbuf, uint16_t dbyt]);
 ;
 ; CC65 uses 2 bytes for every variadic parameter, even if they are uint8_t (from cl65 output), so each param
 ; should be done with popax.
diff --git a/atari/src/fn_network/network_json_parse.s b/atari/src/fn_network/network_json_parse.s
@@ -11,7 +11,7 @@
         .include    "macros.inc"
         .include    "zp.inc"
 
-; uint8_t network_json_parse(char *devicespec);
+; uint8_t network_json_parse(const char *devicespec);
 ;
 .proc _network_json_parse
         axinto  ptr1            ; devicespec
diff --git a/atari/src/fn_network/network_json_query.s b/atari/src/fn_network/network_json_query.s
@@ -22,7 +22,7 @@
         .include    "macros.inc"
         .include    "zp.inc"
 
-; int16_t network_json_query(char *devicespec, char *query, char *s);
+; int16_t network_json_query(const char *devicespec, const char *query, char *s);
 ;
 ; TODO: how do we deal with very large json results? Maybe interface with network_read, which can handle them.
 ; Or does sio_read work with any max size?
diff --git a/atari/src/fn_network/network_open.s b/atari/src/fn_network/network_open.s
@@ -14,7 +14,7 @@
         .include    "zp.inc"
         .include    "macros.inc"
 
-; uint8_t network_open(char* devicespec, uint8_t mode, uint8_t trans);
+; uint8_t network_open(const char* devicespec, uint8_t mode, uint8_t trans);
 .proc _network_open
         pha                             ; save trans
 
diff --git a/atari/src/fn_network/network_status.s b/atari/src/fn_network/network_status.s
@@ -14,7 +14,7 @@
         .include    "macros.inc"
         .include    "zp.inc"
 
-; uint8_t network_status(char *devicespec, uint16_t *bw, uint8_t *c, uint8_t *err);
+; uint8_t network_status(const char *devicespec, uint16_t *bw, uint8_t *c, uint8_t *err);
 ;
 ; Return will be either FN_ERR_OK, or FN_ERR_IO_ERROR.
 ; Actual device error is stored in err
diff --git a/atari/src/fn_network/network_write.s b/atari/src/fn_network/network_write.s
@@ -11,7 +11,7 @@
         .include    "zp.inc"
         .include    "macros.inc"
 
-; uint8_t network_write(char* devicespec, uint8_t *buf, uint16_t len)
+; uint8_t network_write(const char *devicespec, const uint8_t *buf, uint16_t len)
 _network_write:
         axinto  tmp7                    ; len
 
diff --git a/commodore/src/fn_network/network_close.c b/commodore/src/fn_network/network_close.c
@@ -3,7 +3,7 @@
 #include "fujinet-network.h"
 #include "fujinet-network-cbm.h"
 
-uint8_t network_close(char* devicespec)
+uint8_t network_close(const char* devicespec)
 {
 	uint8_t device_number;
 	const char *after;
diff --git a/commodore/src/fn_network/network_http_set_channel_mode.c b/commodore/src/fn_network/network_http_set_channel_mode.c
@@ -6,7 +6,7 @@
 
 uint8_t *scm_cmd = "M,c,0,m";
 
-uint8_t network_http_set_channel_mode(char *devicespec, uint8_t mode)
+uint8_t network_http_set_channel_mode(const char *devicespec, uint8_t mode)
 {
 	// send "M,<channel>,0,<mode>"
 	const char *after;
diff --git a/commodore/src/fn_network/network_ioctl.c b/commodore/src/fn_network/network_ioctl.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include "fujinet-network.h"
 
-uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, char* devicespec, ...)
+uint8_t network_ioctl(uint8_t cmd, uint8_t aux1, uint8_t aux2, const char* devicespec, ...)
 {
 	// not needed for CBM?
 	return 0;
diff --git a/commodore/src/fn_network/network_json_parse.c b/commodore/src/fn_network/network_json_parse.c
@@ -6,7 +6,7 @@
 uint8_t *cmd_mode = "chmode,N,json";
 uint8_t *cmd_parse = "jsonparse,N"; 
 
-uint8_t network_json_parse(char *devicespec)
+uint8_t network_json_parse(const char *devicespec)
 {
 	// for CBM, we need to set the channel mode to json, then send "JSONPARSE" command with the appropriate channel id for devicespec
 	const char *after;
diff --git a/commodore/src/fn_network/network_json_query.c b/commodore/src/fn_network/network_json_query.c
@@ -7,7 +7,7 @@
 
 uint8_t *jq_cmd = "jq,N,";
 
-int16_t network_json_query(char *devicespec, char *query, char *s)
+int16_t network_json_query(const char *devicespec, const char *query, char *s)
 {
 	// for CBM, we just send the "JQ" command with the appropriate channel id for devicespec, and add the query on the end
 	const char *after;
diff --git a/commodore/src/fn_network/network_open.c b/commodore/src/fn_network/network_open.c
@@ -7,7 +7,7 @@
 
 uint8_t cmd_channel_open[2] = { 0x01, 0x00 };
 
-uint8_t network_open(char* devicespec, uint8_t mode, uint8_t trans)
+uint8_t network_open(const char* devicespec, uint8_t mode, uint8_t trans)
 {
 	uint8_t device_number;
 	uint8_t data_channel;
diff --git a/commodore/src/fn_network/network_status.c b/commodore/src/fn_network/network_status.c
@@ -6,7 +6,7 @@
 uint8_t *nw_status_cmd = "statusb,N";
 
 // we only really need the device id, not the full devicespec in all network_status calls.
-uint8_t network_status(char *devicespec, uint16_t *bw, uint8_t *c, uint8_t *err)
+uint8_t network_status(const char *devicespec, uint16_t *bw, uint8_t *c, uint8_t *err)
 {
 	// if we do a read on the nw_status_cmd channel, we get the status for the specified devicespec, but we have to tell FN which device we want the status for first
 	const char *after;
diff --git a/commodore/src/fn_network/network_write.c b/commodore/src/fn_network/network_write.c
@@ -3,7 +3,7 @@
 #include "fujinet-network.h"
 #include "fujinet-network-cbm.h"
 
-uint8_t network_write(char* devicespec, uint8_t *buf, uint16_t len)
+uint8_t network_write(const char *devicespec, const uint8_t *buf, uint16_t len)
 {
 	const char *after;
 	uint8_t data_channel;
diff --git a/testing/bdd-testing/features/atari/stubs/stub_network_http_set_channel_mode.s b/testing/bdd-testing/features/atari/stubs/stub_network_http_set_channel_mode.s
@@ -6,7 +6,7 @@
         .include    "zp.inc"
         .include    "macros.inc"
 
-; uint8_t network_http_set_channel_mode(char* devicespec, uint8_t mode);
+; uint8_t network_http_set_channel_mode(const char* devicespec, uint8_t mode);
 _network_http_set_channel_mode:
         sta     t_mode
         popax   t_ds
diff --git a/testing/bdd-testing/features/atari/stubs/stub_network_http_set_channel_mode_multi.s b/testing/bdd-testing/features/atari/stubs/stub_network_http_set_channel_mode_multi.s
@@ -6,7 +6,7 @@
         .include    "zp.inc"
         .include    "macros.inc"
 
-; uint8_t network_http_set_channel_mode(char* devicespec, uint8_t mode);
+; uint8_t network_http_set_channel_mode(const char* devicespec, uint8_t mode);
 _network_http_set_channel_mode:
         ldy     t_round
 
diff --git a/testing/bdd-testing/features/atari/stubs/stub_network_open.s b/testing/bdd-testing/features/atari/stubs/stub_network_open.s
@@ -7,7 +7,7 @@
         .include    "zp.inc"
         .include    "macros.inc"
 
-; uint8_t network_open(char* devicespec, uint8_t mode, uint8_t trans);
+; uint8_t network_open(const char* devicespec, uint8_t mode, uint8_t trans);
 _network_open:
         sta     t_trans
         popa    t_mode
diff --git a/testing/bdd-testing/features/atari/stubs/stub_network_write.s b/testing/bdd-testing/features/atari/stubs/stub_network_write.s
@@ -6,7 +6,7 @@
         .include    "zp.inc"
         .include    "macros.inc"
 
-; uint8_t network_write(char* devicespec, uint8_t *buf, uint16_t len)
+; uint8_t network_write(const char *devicespec, const uint8_t *buf, uint16_t len)
 _network_write:
         axinto  t_len
         popax   t_buf

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include <eos.h>`
`4`	`4`	`#include "fujinet-network.h"`
`5`	`5`
`6`		`-uint8_t network_close(char* devicespec)`
	`6`	`+uint8_t network_close(const char* devicespec)`
`7`	`7`	`{`
`8`	`8`	`unsigned char u = network_unit_adamnet(devicespec);`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#include <stdint.h>`
`3`	`3`	`#include "fujinet-network.h"`
`4`	`4`
`5`		`-uint8_t network_http_set_channel_mode(char *devicespec, uint8_t mode)`
	`5`	`+uint8_t network_http_set_channel_mode(const char *devicespec, uint8_t mode)`
`6`	`6`	`{`
`7`	`7`	`return 0;`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* @param trans Translation mode 0 = none ...`
`12`	`12`	`* @return FN_error code.`
`13`	`13`	`*/`
`14`		`-uint8_t network_open(char* devicespec, uint8_t mode, uint8_t trans)`
	`14`	`+uint8_t network_open(const char* devicespec, uint8_t mode, uint8_t trans)`
`15`	`15`	`{`
`16`	`16`	`struct _o`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include "fujinet-network.h"`
`5`	`5`	`#include "fujinet-network-adam.h"`
`6`	`6`
`7`		`-uint8_t network_status(char devicespec, uint16_t bw, uint8_t c, uint8_t err)`
	`7`	`+uint8_t network_status(const char devicespec, uint16_t bw, uint8_t c, uint8_t err)`
`8`	`8`	`{`
`9`	`9`	`struct _ns`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`.import _sp_nw_unit`
`11`	`11`	`.import pusha`
`12`	`12`
`13`		`-; uint8_t network_close(char* devicespec);`
	`13`	`+; uint8_t network_close(const char* devicespec);`
`14`	`14`	`;`
`15`	`15`	`; returns 0 for ok, error code from control call for anything else.`
`16`	`16`	`; returns 1 if the sp_network isn't set, e.g. calling before calling _network_open.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include <stdint.h>`
`2`	`2`	`#include "fujinet-network.h"`
`3`	`3`
`4`		`-uint8_t network_http_set_channel_mode(char *devicespec, uint8_t mode) {`
	`4`	`+uint8_t network_http_set_channel_mode(const char *devicespec, uint8_t mode) {`
`5`	`5`	`return network_ioctl('M', 0, mode, devicespec, 1, 0, 2);`
`6`	`6`	`}`