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:
parent
35bea2ba0d
commit
5cf0194676
4 changed files with 23 additions and 21 deletions
|
|
@ -22,8 +22,8 @@ long e_levels[] = {
|
|||
};
|
||||
|
||||
bool roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl);
|
||||
void hit(char *er, char *ee);
|
||||
void miss(char *er, char *ee);
|
||||
void hit(const char *er, const char *ee);
|
||||
void miss(const char *er, const char *ee);
|
||||
int str_plus(str_t str);
|
||||
int add_dam(str_t str);
|
||||
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
|
||||
*/
|
||||
char *
|
||||
prname(char *who, bool upper)
|
||||
prname(const char *who, bool upper)
|
||||
{
|
||||
static char tbuf[MAXSTR];
|
||||
|
||||
|
|
@ -470,7 +470,7 @@ prname(char *who, bool upper)
|
|||
* Print a message to indicate a succesful hit
|
||||
*/
|
||||
void
|
||||
hit(char *er, char *ee)
|
||||
hit(const char *er, const char *ee)
|
||||
{
|
||||
register char *s = "";
|
||||
|
||||
|
|
@ -496,7 +496,7 @@ hit(char *er, char *ee)
|
|||
* Print a message to indicate a poor swing
|
||||
*/
|
||||
void
|
||||
miss(char *er, char *ee)
|
||||
miss(const char *er, const char *ee)
|
||||
{
|
||||
register char *s = "";
|
||||
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ aggravate(void)
|
|||
* "an".
|
||||
*/
|
||||
char *
|
||||
vowelstr(char *str)
|
||||
vowelstr(const char *str)
|
||||
{
|
||||
switch (*str)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -619,7 +619,7 @@ void unconfuse(void);
|
|||
char *unctrol(char ch);
|
||||
void unlock_sc(void);
|
||||
void unsee(void);
|
||||
char *vowelstr(char *str);
|
||||
char *vowelstr(const char *str);
|
||||
char *xcrypt(const char *key, const char *setting);
|
||||
void w_wait_for(WINDOW *win, char ch);
|
||||
void wait_for(char ch);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue