From 1a3b779ace2e427d3dff89dc97085ee34747602f Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sun, 12 Jul 2020 13:41:57 +0900
Subject: [PATCH] Use const strings for file names

---
 modules/NightDemonDemo/NightDemonDemo.c |  2 +-
 modules/NightDemonDemo/ndd.c            |  4 ++--
 modules/SACT/sactamask.h                |  2 +-
 modules/lib/alk.c                       |  2 +-
 modules/lib/alk.h                       |  2 +-
 src/ald_manager.c                       |  2 +-
 src/ald_manager.h                       |  2 +-
 src/dri.c                               |  4 ++--
 src/dri.h                               |  2 +-
 src/filecheck.c                         |  8 +++----
 src/filecheck.h                         |  6 +++---
 src/gameresource.h                      | 18 ++++++++--------
 src/nact.h                              | 28 ++++++++++++-------------
 src/s39ain.h                            |  2 +-
 src/savedata.c                          |  4 ++--
 src/savedata.h                          |  4 ++--
 16 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/modules/NightDemonDemo/NightDemonDemo.c b/modules/NightDemonDemo/NightDemonDemo.c
index 48be00f..33d6cd7 100644
--- a/modules/NightDemonDemo/NightDemonDemo.c
+++ b/modules/NightDemonDemo/NightDemonDemo.c
@@ -31,7 +31,7 @@
 #include "modules.h"
 #include "nact.h"
 
-extern void ndd_init(char *files[], int n);
+extern void ndd_init(const char *files[], int n);
 extern void ndd_run(int demonum);
 
 static void Init() {
diff --git a/modules/NightDemonDemo/ndd.c b/modules/NightDemonDemo/ndd.c
index b93b7ad..8df0795 100644
--- a/modules/NightDemonDemo/ndd.c
+++ b/modules/NightDemonDemo/ndd.c
@@ -39,7 +39,7 @@
 // 2: Meteo
 
 struct nddemo {
-	char **fn;
+	const char **fn;
 	alk_t *alk;
 	surface_t *sf[10];
 };
@@ -52,7 +52,7 @@ static int ndemo_nums[3] = {150, 603, 467};
 extern surface_t *jpeg2surface(FILE *fp, int offset);
 
 // ALKファイルの登録
-void ndd_init(char *files[], int n) {
+void ndd_init(const char *files[], int n) {
 	int i;
 	ndd.fn = malloc(sizeof(char *) * n);
 
diff --git a/modules/SACT/sactamask.h b/modules/SACT/sactamask.h
index 6b97924..3e9438d 100644
--- a/modules/SACT/sactamask.h
+++ b/modules/SACT/sactamask.h
@@ -24,6 +24,6 @@
 #ifndef __SACTAMASK_H__
 #define __SACTAMASK_H__
 
-extern int smask_init(char *path);
+extern int smask_init(const char *path);
 
 #endif
diff --git a/modules/lib/alk.c b/modules/lib/alk.c
index 52c7b93..6d9adb6 100644
--- a/modules/lib/alk.c
+++ b/modules/lib/alk.c
@@ -41,7 +41,7 @@
 #include "LittleEndian.h"
 #include "alk.h"
 
-alk_t *alk_new(char *path) {
+alk_t *alk_new(const char *path) {
 	alk_t *alk;
 	int i, fd;
 	char *adr;
diff --git a/modules/lib/alk.h b/modules/lib/alk.h
index 9f2ed40..645f34a 100644
--- a/modules/lib/alk.h
+++ b/modules/lib/alk.h
@@ -44,7 +44,7 @@ typedef struct {
 	int  *offset;  /* 各ファイルへのオフセット          */
 } alk_t;
 
-extern alk_t *alk_new(char *path);
+extern alk_t *alk_new(const char *path);
 extern int    alk_free(alk_t *alk);
 extern char  *alk_get(alk_t *alk, int no);
 
diff --git a/src/ald_manager.c b/src/ald_manager.c
index c21d0e7..e54dd9d 100644
--- a/src/ald_manager.c
+++ b/src/ald_manager.c
@@ -103,7 +103,7 @@ void ald_freedata(dridata *data) {
  *   cnt : number in file name array
  *   mmap: mmap file or not
 */
-void ald_init(int type, char **file, int cnt, boolean mmap) {
+void ald_init(int type, const char **file, int cnt, boolean mmap) {
 	/* check wrong type */
 	if (type < DRIFILETYPEMAX) {
 		dri[type] = dri_init(file, cnt, mmap);
diff --git a/src/ald_manager.h b/src/ald_manager.h
index f087343..4646e3c 100644
--- a/src/ald_manager.h
+++ b/src/ald_manager.h
@@ -38,7 +38,7 @@ typedef enum {
 	DRIFILE_BGM =6   /* stream music data */
 } DRIFILETYPE;
 
-extern void     ald_init(int type, char **file, int cnt, boolean mmap);
+extern void     ald_init(int type, const char **file, int cnt, boolean mmap);
 extern dridata *ald_getdata(DRIFILETYPE type, int no);
 extern void     ald_freedata(dridata *data);
 
diff --git a/src/dri.c b/src/dri.c
index de53a9e..4c9f66d 100644
--- a/src/dri.c
+++ b/src/dri.c
@@ -175,13 +175,13 @@ static void get_fileptr(drifiles *d, FILE *fp, int disk) {
  *   mmapping: mmap file or not
  *   return: drifile object
 */
-drifiles *dri_init(char **file, int cnt, boolean mmapping) {
+drifiles *dri_init(const char **file, int cnt, boolean mmapping) {
 	drifiles *d = calloc(1, sizeof(drifiles));
 	FILE *fp;
 	int i;
 	boolean gotmap = FALSE;
 	long filesize;
-	char **filetop = file;
+	const char **filetop = file;
 	
 	for (i = 0; i < cnt; i++) {
 		if (*(file + i) == NULL) continue;
diff --git a/src/dri.h b/src/dri.h
index c562b74..c180151 100644
--- a/src/dri.h
+++ b/src/dri.h
@@ -55,7 +55,7 @@ struct _dridata {
 };
 typedef struct _dridata dridata;
 
-extern drifiles *dri_init(char **file, int cnt, boolean mmapping);
+extern drifiles *dri_init(const char **file, int cnt, boolean mmapping);
 extern dridata  *dri_getdata(drifiles *d, int no);
 
 #endif /* !__DRI__ */
diff --git a/src/filecheck.c b/src/filecheck.c
index 3d5c88f..412d069 100644
--- a/src/filecheck.c
+++ b/src/filecheck.c
@@ -38,7 +38,7 @@ struct fnametable {
 static char *saveDataPath;
 static boolean newfile_kanjicode_utf8 = TRUE;
 
-static char *get_fullpath(const char* dir, char *filename) {
+static char *get_fullpath(const char* dir, const char *filename) {
 	char *fn = malloc(strlen(filename) + strlen(dir) + 3);
 	if (fn == NULL) {
 		return NULL;
@@ -51,7 +51,7 @@ static char *get_fullpath(const char* dir, char *filename) {
 
 /* list up file in current directory */
 /*   name : save/load directory      */
-void fc_init(char *name) {
+void fc_init(const char *name) {
 	saveDataPath = strdup(name);
 }
 
@@ -75,7 +75,7 @@ static char *fc_search(const char *fname_sjis, const char *dir) {
 	return found;
 }
 
-FILE *fc_open(char *filename, char type) {
+FILE *fc_open(const char *filename, char type) {
 	char *fullpath = fc_search(filename, saveDataPath);
 	if (fullpath == NULL) {
 		if (type == 'r') {
@@ -106,7 +106,7 @@ FILE *fc_open(char *filename, char type) {
 	return fp;
 }
 
-void fc_backup_oldfile(char *filename) {
+void fc_backup_oldfile(const char *filename) {
 #ifndef __EMSCRIPTEN__
 	char *newname;
 	
diff --git a/src/filecheck.h b/src/filecheck.h
index f80e253..78ab71b 100644
--- a/src/filecheck.h
+++ b/src/filecheck.h
@@ -27,9 +27,9 @@
 #define FILENAME_KANJI_CODE_UTF8 0
 #define FILENAME_KANJI_CODE_SJIS 1
 
-extern void fc_init(char *name);
-extern FILE *fc_open(char *filename, char type);
-extern void fc_backup_oldfile(char *filename);
+extern void fc_init(const char *name);
+extern FILE *fc_open(const char *filename, char type);
+extern void fc_backup_oldfile(const char *filename);
 extern void fc_set_default_kanjicode(int c);
 
 #endif /* !__FILECHECK_H__ */
diff --git a/src/gameresource.h b/src/gameresource.h
index 22020fe..9e57f53 100644
--- a/src/gameresource.h
+++ b/src/gameresource.h
@@ -29,16 +29,16 @@
 #include "savedata.h"
 
 typedef struct {
-	char *game_fname[DRIFILETYPEMAX][DRIFILEMAX];
+	const char *game_fname[DRIFILETYPEMAX][DRIFILEMAX];
 	int cnt[DRIFILETYPEMAX];
-	char *save_path;
-	char *save_fname[SAVE_MAXNUMBER];
-	char *ain;
-	char *wai;
-	char *bgi;
-	char *sact01;
-	char *init;
-	char *alk[10];
+	const char *save_path;
+	const char *save_fname[SAVE_MAXNUMBER];
+	const char *ain;
+	const char *wai;
+	const char *bgi;
+	const char *sact01;
+	const char *init;
+	const char *alk[10];
 } GameResource;
 
 boolean initGameResource(GameResource *gr, const char *gr_fname);
diff --git a/src/nact.h b/src/nact.h
index fc2ed1a..8d85b4c 100644
--- a/src/nact.h
+++ b/src/nact.h
@@ -125,20 +125,20 @@ typedef struct {
 
 	/* データのファイル名 */
 	struct {
-		char *scenario[2];
-		char *graphics[2];
-		char *wav[2];
-		char *midi[2];
-		char *data[2];
-		char *resource[2];
-		char *bgm[2];
-		char *save[27];
-		char *savedir;
-		char *init;
-		char *bgi;
-		char *wai;
-		char *sact01;
-		char *alk[10];
+		const char *scenario[2];
+		const char *graphics[2];
+		const char *wav[2];
+		const char *midi[2];
+		const char *data[2];
+		const char *resource[2];
+		const char *bgm[2];
+		const char *save[27];
+		const char *savedir;
+		const char *init;
+		const char *bgi;
+		const char *wai;
+		const char *sact01;
+		const char *alk[10];
 	} files;
 	
 	int frame_count;
diff --git a/src/s39ain.h b/src/s39ain.h
index 6eb7b82..2156c71 100644
--- a/src/s39ain.h
+++ b/src/s39ain.h
@@ -50,7 +50,7 @@ typedef struct {
 
 /* System39.ain 全体の情報 */
 typedef struct {
-	char *path_to_ain; /* system39.ain へのパス  */
+	const char *path_to_ain; /* system39.ain へのパス  */
 	
 	int   dllnum; /* DLL  の数 */
 	int   fncnum; /* FUNC の数 */
diff --git a/src/savedata.c b/src/savedata.c
index e367b6c..9c1adc9 100644
--- a/src/savedata.c
+++ b/src/savedata.c
@@ -64,13 +64,13 @@ EM_JS(void, scheduleSync, (), {
 #endif
 
 /* savefile がある directory を登録 */
-void save_set_path(char *path) {
+void save_set_path(const char *path) {
 	nact->files.savedir = strdup(path);
 	fc_init(path);
 }
 
 /* savefile を登録 */
-void save_register_file(char *name, int index) {
+void save_register_file(const char *name, int index) {
 	saveDataFile[index] = strdup(name);
 }
 
diff --git a/src/savedata.h b/src/savedata.h
index 7ece830..5d84417 100644
--- a/src/savedata.h
+++ b/src/savedata.h
@@ -125,8 +125,8 @@ extern int save_load_var_with_file(char *filename, int *start, int cnt);
 extern int save_save_str_with_file(char *filename, int start, int cnt);
 extern int save_load_str_with_file(char *filename, int start, int cnt);
 extern BYTE* load_cg_with_file(char *file, int *status, long *filesize);
-extern void save_set_path(char *path);
-extern void save_register_file(char *name, int index);
+extern void save_set_path(const char *path);
+extern void save_register_file(const char *name, int index);
 extern char* save_get_file(int index);
 extern int save_delete_file(int index);