summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2013-03-26 17:11:00 +0100
committerBardur Arantsson <bardur@scientician.net>2013-09-27 14:46:41 +0200
commit9eb646ef8c1f2824a113a111516d1c73d798746c (patch)
tree5b2485a05320acf88ff06fcc8523e93da776e39d
parent8cdd45b0b475e910ebe393bc96e6497b2ffeb292 (diff)
Constness fixes
-rw-r--r--src/externs.h4
-rw-r--r--src/files.c2
-rw-r--r--src/hooks.c6
-rw-r--r--src/hooks.h12
-rw-r--r--src/xtra2.c2
5 files changed, 17 insertions, 9 deletions
diff --git a/src/externs.h b/src/externs.h
index 41b59cb3..4ba664b4 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -858,7 +858,7 @@ extern void display_scores(int from, int to);
extern errr predict_score(void);
extern void predict_score_gui(bool_ *initialized, bool_ *game_in_progress);
extern void close_game(void);
-extern errr get_rnd_line(char * file_name, char * output);
+extern errr get_rnd_line(const char * file_name, char * output);
extern char *get_line(char* fname, cptr fdir, char *linbuf, int line);
extern void do_cmd_knowledge_corruptions(void);
extern void race_legends(void);
@@ -2062,7 +2062,7 @@ extern void set_subrace_title(int racem, cptr name);
extern void switch_subrace(int racem, bool_ copy_old);
extern void drop_from_wild(void);
extern void clean_wish_name(char *buf, char *name);
-extern bool_ test_object_wish(char *name, object_type *o_ptr, object_type *forge, char *what);
+extern bool_ test_object_wish(char *name, object_type *o_ptr, object_type *forge, const char *what);
extern bool_ set_roots(int v, s16b ac, s16b dam);
extern bool_ set_project(int v, s16b gf, s16b dam, s16b rad, s16b flag);
extern bool_ set_rush(int v);
diff --git a/src/files.c b/src/files.c
index d056c125..ad8322cf 100644
--- a/src/files.c
+++ b/src/files.c
@@ -5593,7 +5593,7 @@ void close_game(void)
/*
* Grab a randomly selected line in lib/file/file_name
*/
-errr get_rnd_line(char *file_name, char *output)
+errr get_rnd_line(const char *file_name, char *output)
{
FILE *fp;
diff --git a/src/hooks.c b/src/hooks.c
index 2b70e90d..08418035 100644
--- a/src/hooks.c
+++ b/src/hooks.c
@@ -148,7 +148,7 @@ object_type* get_next_arg_obj() {
/* Actually process the hooks */
int process_hooks_restart = FALSE;
hook_return process_hooks_return[20];
-static bool_ vprocess_hooks_return (int h_idx, char *ret, char *fmt, va_list *ap)
+static bool_ vprocess_hooks_return (int h_idx, const char *ret, const char *fmt, va_list *ap)
{
hooks_chain *c = hooks_heads[h_idx];
va_list real_ap;
@@ -217,7 +217,7 @@ static bool_ vprocess_hooks_return (int h_idx, char *ret, char *fmt, va_list *ap
return FALSE;
}
-bool_ process_hooks_ret(int h_idx, char *ret, char *fmt, ...)
+bool_ process_hooks_ret(int h_idx, const char *ret, const char *fmt, ...)
{
va_list ap;
bool_ r;
@@ -228,7 +228,7 @@ bool_ process_hooks_ret(int h_idx, char *ret, char *fmt, ...)
return (r);
}
-bool_ process_hooks(int h_idx, char *fmt, ...)
+bool_ process_hooks(int h_idx, const char *fmt, ...)
{
va_list ap;
bool_ ret;
diff --git a/src/hooks.h b/src/hooks.h
index 0c83cf84..8ea87bc3 100644
--- a/src/hooks.h
+++ b/src/hooks.h
@@ -2,6 +2,10 @@
#include "angband.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern FILE *hook_file;
extern void wipe_hooks(void);
extern void init_hooks(void);
@@ -13,6 +17,10 @@ extern char* get_next_arg_str(const char *fmt);
extern object_type *get_next_arg_obj();
extern int process_hooks_restart;
extern hook_return process_hooks_return[20];
-extern bool_ process_hooks_ret(int h_idx, char *ret, char *fmt, ...);
-extern bool_ process_hooks(int h_idx, char *fmt, ...);
+extern bool_ process_hooks_ret(int h_idx, const char *ret, const char *fmt, ...);
+extern bool_ process_hooks(int h_idx, const char *fmt, ...);
extern bool_ process_hooks_new(int h_idx, void *in, void *out);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/xtra2.c b/src/xtra2.c
index 3e0a1800..53abc149 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -5472,7 +5472,7 @@ void set_grace(s32b v)
handle_stuff();
}
-bool_ test_object_wish(char *name, object_type *o_ptr, object_type *forge, char *what)
+bool_ test_object_wish(char *name, object_type *o_ptr, object_type *forge, const char *what)
{
int i, j, jb, save_aware;
char buf[200];