nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Use const char * for read_simplemail 'mbox' param

Browse Source 
Nothing about read_simplemail is incompatible with using const, and the
lack of const required some contortions (copying ADMIN_SERVER_MSG to
another buffer with nonconst() to prevent a compiler warning).

This was the last place nonconst() was used, so I removed it.
This commit is contained in:
Michael Meyer
2022-08-31 21:42:02 -04:00
committed by Pasi Kallinen
parent b18d768b26
commit 51d568319b
3 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mail.c
View File

@@ -45,7 +45,7 @@ static boolean md_stop(coord *, coord *);
static boolean md_rush(struct monst *, int, int);
static void newmail(struct mail_info *);
#if defined(SIMPLE_MAIL) || defined(SERVER_ADMIN_MSG)
static void read_simplemail(char *mbox, boolean adminmsg);
static void read_simplemail(const char *mbox, boolean adminmsg);
#endif
#if !defined(UNIX) && !defined(VMS)
@@ -561,7 +561,7 @@ ckmailstatus(void)
#if defined(SIMPLE_MAIL) || defined(SERVER_ADMIN_MSG)
void
read_simplemail(char *mbox, boolean adminmsg)
read_simplemail(const char *mbox, boolean adminmsg)
{
FILE* mb = fopen(mbox, "r");
char curline[128], *msg;
@@ -662,15 +662,13 @@ ck_server_admin_msg(void)
#ifdef SERVER_ADMIN_MSG
static struct stat ost,nst;
static long lastchk = 0;
char adminbuf[BUFSZ];
if (g.moves < lastchk + SERVER_ADMIN_MSG_CKFREQ) return;
lastchk = g.moves;
if (!stat(SERVER_ADMIN_MSG, &nst)) {
if (nst.st_mtime > ost.st_mtime)
read_simplemail(nonconst(SERVER_ADMIN_MSG, adminbuf,
sizeof adminbuf), TRUE);
read_simplemail(SERVER_ADMIN_MSG, TRUE);
ost.st_mtime = nst.st_mtime;
}
#endif /* SERVER_ADMIN_MSG */