warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some potential problems detected by clang.

Browse source 
Most of these are unnecessary comparisons and functions returning the
wrong types.
This commit is contained in:
John "Elwin" Edwards 2017-09-23 09:47:00 -04:00
parent 614dcfffd2
commit 172c83f254
11 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arogue5/main.c
View file

@ -200,8 +200,7 @@ main(int argc, char *argv[], char *envp[])
} }
if (!use_savedir) { if (!use_savedir) {
if ((whoami == NULL) || (*whoami == '\0') || if ((*whoami == '\0') || (strcmp(whoami,"dosuser")==0))
(strcmp(whoami,"dosuser")==0))
{ {
echo(); echo();
mvaddstr(23,2,"Rogue's Name? "); mvaddstr(23,2,"Rogue's Name? ");
@ -209,7 +208,7 @@ main(int argc, char *argv[], char *envp[])
noecho(); noecho();
} }
if ((whoami == NULL) || (*whoami == '\0')) if (*whoami == '\0')
strcpy(whoami,"Rodney"); strcpy(whoami,"Rodney");
} }

8
arogue5/mdport.c
View file

@ -132,7 +132,7 @@ md_hasclreol(void)
static int md_standout_mode = 0; static int md_standout_mode = 0;
int void
md_raw_standout(void) md_raw_standout(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -155,7 +155,7 @@ md_raw_standout(void)
#endif #endif
} }
int void
md_raw_standend(void) md_raw_standend(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -223,7 +223,7 @@ md_fdopen(int fd, char *mode)
#endif #endif
} }
int void
md_normaluser(void) md_normaluser(void)
{ {
#ifndef _WIN32 #ifndef _WIN32
@ -596,7 +596,7 @@ md_rand(void)
#endif #endif
} }
int void
md_srand(int seed) md_srand(int seed)
{ {
#ifdef _WIN32 #ifdef _WIN32

4
arogue5/rogue.h
View file

@ -1189,12 +1189,12 @@ extern char *md_getroguedir(void);
extern void md_init(void); extern void md_init(void);
extern FILE * md_fdopen(int fd, char *mode); extern FILE * md_fdopen(int fd, char *mode);
extern int md_unlink(char *file); extern int md_unlink(char *file);
extern int md_normaluser(void); extern void md_normaluser(void);
extern int md_getuid(void); extern int md_getuid(void);
extern long md_memused(void); extern long md_memused(void);
extern int md_readchar(WINDOW *win); extern int md_readchar(WINDOW *win);
extern int md_shellescape(void); extern int md_shellescape(void);
extern int md_srand(int seed); extern void md_srand(int seed);
extern int md_rand(void); extern int md_rand(void);
extern int md_erasechar(void); extern int md_erasechar(void);
extern int md_killchar(void); extern int md_killchar(void);

8
arogue7/mdport.c
View file

@ -111,7 +111,7 @@ md_init(void)
static int md_standout_mode = 0; static int md_standout_mode = 0;
int void
md_raw_standout(void) md_raw_standout(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -134,7 +134,7 @@ md_raw_standout(void)
#endif #endif
} }
int void
md_raw_standend(void) md_raw_standend(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -213,7 +213,7 @@ md_creat(char *file, int mode)
} }
int void
md_normaluser(void) md_normaluser(void)
{ {
#ifndef _WIN32 #ifndef _WIN32
@ -581,7 +581,7 @@ md_rand(void)
#endif #endif
} }
int void
md_srand(int seed) md_srand(int seed)
{ {
#ifdef _WIN32 #ifdef _WIN32

4
arogue7/rogue.h
View file

@ -1417,12 +1417,12 @@ char *md_getusername(void);
void md_init(void); void md_init(void);
int md_killchar(void); int md_killchar(void);
long md_memused(void); long md_memused(void);
int md_normaluser(void); void md_normaluser(void);
int md_rand(void); int md_rand(void);
unsigned int md_random_seed(void); unsigned int md_random_seed(void);
int md_readchar(WINDOW *win); int md_readchar(WINDOW *win);
int md_shellescape(void); int md_shellescape(void);
int md_srand(int seed); void md_srand(int seed);
int md_unlink(char *file); int md_unlink(char *file);
int md_unlink_open_file(char *file, FILE *inf); int md_unlink_open_file(char *file, FILE *inf);

2
rogue3/init.c
View file

@ -65,7 +65,7 @@ char *ws_guess[MAXSTICKS]; /* Players guess at what wand is */
char *ws_type[MAXSTICKS]; /* Is it a wand or a staff */ char *ws_type[MAXSTICKS]; /* Is it a wand or a staff */
char file_name[256]; /* Save file name */ char file_name[256]; /* Save file name */
char home[PATH_MAX]; /* User's home directory */ char home[PATH_MAX]; /* User's home directory */
unsigned char prbuf[80]; /* Buffer for sprintfs */ char prbuf[80]; /* Buffer for sprintfs */
int max_hp; /* Player's max hit points */ int max_hp; /* Player's max hit points */
int ntraps; /* Number of traps on this level */ int ntraps; /* Number of traps on this level */
int max_level; /* Deepest player has gone */ int max_level; /* Deepest player has gone */

2
rogue3/rogue.h
View file

@ -469,7 +469,7 @@ extern int p_know[MAXPOTIONS]; /* Does he know what a potion d
extern struct magic_item p_magic[MAXPOTIONS]; /* Names and chances for potions */ extern struct magic_item p_magic[MAXPOTIONS]; /* Names and chances for potions */
extern struct thing player; /* The rogue */ extern struct thing player; /* The rogue */
extern int playing; /* True until he quits */ extern int playing; /* True until he quits */
extern unsigned char prbuf[80]; /* Buffer for sprintfs */ extern char prbuf[80]; /* Buffer for sprintfs */
extern int purse; /* How much gold the rogue has */ extern int purse; /* How much gold the rogue has */
extern int quiet; /* Number of quiet turns */ extern int quiet; /* Number of quiet turns */
extern char * r_guess[MAXRINGS]; /* Players guess at what ring is */ extern char * r_guess[MAXRINGS]; /* Players guess at what ring is */

4
rogue4/main.c
View file

@ -181,7 +181,7 @@ main(int argc, char *argv[], char *envp[])
exit(1); exit(1);
} }
if ((whoami == NULL) || (*whoami == '\0') || (strcmp(whoami,"dosuser")==0)) if ((*whoami == '\0') || (strcmp(whoami,"dosuser")==0))
{ {
echo(); echo();
mvaddstr(23,2,"Rogue's Name? "); mvaddstr(23,2,"Rogue's Name? ");
@ -189,7 +189,7 @@ main(int argc, char *argv[], char *envp[])
noecho(); noecho();
} }
if ((whoami == NULL) || (*whoami == '\0')) if (*whoami == '\0')
strcpy(whoami,"Rodney"); strcpy(whoami,"Rodney");
setup(); setup();

4
srogue/main.c
View file

@ -201,7 +201,7 @@ main(int argc, char *argv[], char *envp[])
byebye(1); byebye(1);
} }
if ((whoami == NULL) || (*whoami == '\0') || (strcmp(whoami,"dosuser")==0)) if ((*whoami == '\0') || (strcmp(whoami,"dosuser")==0))
{ {
echo(); echo();
mvaddstr(23,2,"Rogue's Name? "); mvaddstr(23,2,"Rogue's Name? ");
@ -209,7 +209,7 @@ main(int argc, char *argv[], char *envp[])
noecho(); noecho();
} }
if ((whoami == NULL) || (*whoami == '\0')) if (*whoami == '\0')
strcpy(whoami,"Rodney"); strcpy(whoami,"Rodney");
setup(); setup();

4
xrogue/rogue.h
View file

@ -1503,12 +1503,12 @@ void tstp();
int md_getuid(void); int md_getuid(void);
long md_memused(void); long md_memused(void);
int md_normaluser(void); void md_normaluser(void);
int md_rand(int range); int md_rand(int range);
unsigned int md_random_seed(void); unsigned int md_random_seed(void);
void md_setup(void); void md_setup(void);
int md_shellescape(void); int md_shellescape(void);
int md_srand(int seed); void md_srand(int seed);
/* /*
* Now all the global variables * Now all the global variables

4
xrogue/state.c
View file

@ -3152,7 +3152,7 @@ md_rand(int range)
#endif #endif
} }
int void
md_srand(int seed) md_srand(int seed)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -3598,7 +3598,7 @@ md_setup(void)
noecho(); /* Echo off */ noecho(); /* Echo off */
} }
int void
md_normaluser(void) md_normaluser(void)
{ {
#ifndef _WIN32 #ifndef _WIN32