Declare some function arguments as const.

Some functions, mostly in fight.c, declared variables as pointers to
const char but passed them to functions that took pointers to ordinary
char.  The strings did not actually get modified, so adding 'const' to
the function definitions removed the warnings.
This commit is contained in:
John "Elwin" Edwards 2016-03-06 19:32:47 -05:00
parent 35bea2ba0d
commit 5cf0194676
4 changed files with 23 additions and 21 deletions

View file

@ -20,17 +20,18 @@
bool roll_em(struct thing *att_er, struct thing *def_er, struct object *weap, bool roll_em(struct thing *att_er, struct thing *def_er, struct object *weap,
bool hurl, struct object *cur_weapon, bool back_stab); bool hurl, struct object *cur_weapon, bool back_stab);
void hit(struct object *weapon, struct thing *tp, char *er, char *ee, void hit(struct object *weapon, struct thing *tp, const char *er,
bool back_stab); const char *ee, bool back_stab);
void miss(struct object *weapon, struct thing *tp, char *er, char *ee); void miss(struct object *weapon, struct thing *tp, const char *er,
const char *ee);
int dext_plus(int dexterity); int dext_plus(int dexterity);
int str_plus(short str); int str_plus(short str);
int add_dam(short str); int add_dam(short str);
int hung_dam(void); int hung_dam(void);
void thunk(struct object *weap, struct thing *tp, char *mname); void thunk(struct object *weap, struct thing *tp, const char *mname);
void m_thunk(struct object *weap, struct thing *tp, char *mname); void m_thunk(struct object *weap, struct thing *tp, const char *mname);
void bounce(struct object *weap, struct thing *tp, char *mname); void bounce(struct object *weap, struct thing *tp, const char *mname);
void m_bounce(struct object *weap, struct thing *tp, char *mname); void m_bounce(struct object *weap, struct thing *tp, const char *mname);
struct object *wield_weap(struct object *thrown, struct thing *mp); struct object *wield_weap(struct object *thrown, struct thing *mp);
void explode(struct thing *tp); void explode(struct thing *tp);
@ -1037,7 +1038,7 @@ roll_em(struct thing *att_er, struct thing *def_er, struct object *weap,
*/ */
char * char *
prname(char *who, bool upper) prname(const char *who, bool upper)
{ {
static char tbuf[LINELEN]; static char tbuf[LINELEN];
@ -1062,7 +1063,8 @@ prname(char *who, bool upper)
*/ */
void void
hit(struct object *weapon, struct thing *tp, char *er, char *ee, bool back_stab) hit(struct object *weapon, struct thing *tp, const char *er, const char *ee,
bool back_stab)
{ {
register char *s = NULL; register char *s = NULL;
char char
@ -1119,7 +1121,7 @@ hit(struct object *weapon, struct thing *tp, char *er, char *ee, bool back_stab)
*/ */
void void
miss(struct object *weapon, struct thing *tp, char *er, char *ee) miss(struct object *weapon, struct thing *tp, const char *er, const char *ee)
{ {
register char *s = NULL; register char *s = NULL;
char char
@ -1226,7 +1228,7 @@ hung_dam(void)
*/ */
void void
thunk(struct object *weap, struct thing *tp, char *mname) thunk(struct object *weap, struct thing *tp, const char *mname)
{ {
/* tp: Defender */ /* tp: Defender */
char *def_name; /* Name of defender */ char *def_name; /* Name of defender */
@ -1254,7 +1256,7 @@ thunk(struct object *weap, struct thing *tp, char *mname)
*/ */
void void
m_thunk(struct object *weap, struct thing *tp, char *mname) m_thunk(struct object *weap, struct thing *tp, const char *mname)
{ {
char *att_name; /* Name of attacker */ char *att_name; /* Name of attacker */
@ -1281,7 +1283,7 @@ m_thunk(struct object *weap, struct thing *tp, char *mname)
*/ */
void void
bounce(struct object *weap, struct thing *tp, char *mname) bounce(struct object *weap, struct thing *tp, const char *mname)
{ {
/* tp: Defender */ /* tp: Defender */
char *def_name; /* Name of defender */ char *def_name; /* Name of defender */
@ -1309,7 +1311,7 @@ bounce(struct object *weap, struct thing *tp, char *mname)
*/ */
void void
m_bounce(struct object *weap, struct thing *tp, char *mname) m_bounce(struct object *weap, struct thing *tp, const char *mname)
{ {
char *att_name; /* Name of attacker */ char *att_name; /* Name of attacker */

View file

@ -22,8 +22,8 @@ long e_levels[] = {
}; };
bool roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl); bool roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl);
void hit(char *er, char *ee); void hit(const char *er, const char *ee);
void miss(char *er, char *ee); void miss(const char *er, const char *ee);
int str_plus(str_t str); int str_plus(str_t str);
int add_dam(str_t str); int add_dam(str_t str);
void thunk(THING *weap, const char *mname); void thunk(THING *weap, const char *mname);
@ -446,7 +446,7 @@ roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl)
* The print name of a combatant * The print name of a combatant
*/ */
char * char *
prname(char *who, bool upper) prname(const char *who, bool upper)
{ {
static char tbuf[MAXSTR]; static char tbuf[MAXSTR];
@ -470,7 +470,7 @@ prname(char *who, bool upper)
* Print a message to indicate a succesful hit * Print a message to indicate a succesful hit
*/ */
void void
hit(char *er, char *ee) hit(const char *er, const char *ee)
{ {
register char *s = ""; register char *s = "";
@ -496,7 +496,7 @@ hit(char *er, char *ee)
* Print a message to indicate a poor swing * Print a message to indicate a poor swing
*/ */
void void
miss(char *er, char *ee) miss(const char *er, const char *ee)
{ {
register char *s = ""; register char *s = "";

View file

@ -345,7 +345,7 @@ aggravate(void)
* "an". * "an".
*/ */
char * char *
vowelstr(char *str) vowelstr(const char *str)
{ {
switch (*str) switch (*str)
{ {

View file

@ -619,7 +619,7 @@ void unconfuse(void);
char *unctrol(char ch); char *unctrol(char ch);
void unlock_sc(void); void unlock_sc(void);
void unsee(void); void unsee(void);
char *vowelstr(char *str); char *vowelstr(const char *str);
char *xcrypt(const char *key, const char *setting); char *xcrypt(const char *key, const char *setting);
void w_wait_for(WINDOW *win, char ch); void w_wait_for(WINDOW *win, char ch);
void wait_for(char ch); void wait_for(char ch);