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

warn_unused_result in recover.c

Browse Source 
There is only one warn_unused_result warning from gcc in recover.c,
so actually use that result.

Plus a bit of reformatting (tab replacement).
This commit is contained in:
PatR
2018-12-18 14:01:57 -08:00
parent b5ce81111c
commit 4510bc7e50
1 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/recover.c
+10 -8
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 recover.c $NHDT-Date: 1501461282 2017/07/31 00:34:42 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.16 $ */
/* NetHack 3.6 recover.c $NHDT-Date: 1545170503 2018/12/18 22:01:43 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.18 $ */
/* Copyright (c) Janet Walz, 1992. */
/* NetHack may be freely redistributed. See license for details. */
@@ -58,8 +58,7 @@ char *FDECL(exepath, (char *));
#if defined(__BORLANDC__) && !defined(_WIN32)
extern unsigned _stklen = STKSIZ;
#endif
char
savename[SAVESIZE]; /* holds relative path of save file from playground */
char savename[SAVESIZE]; /* holds relative path of save file from playground */
int
main(argc, argv)
@@ -217,7 +216,7 @@ restore_savefile(basename)
char *basename;
{
int gfd, lfd, sfd;
int lev, savelev, hpid, pltmpsiz;
int res = 0, lev, savelev, hpid, pltmpsiz;
xchar levc;
struct version_info version_data;
struct savefile_info sfi;
@@ -348,7 +347,7 @@ char *basename;
set_levelfile_name(0);
(void) unlink(lock);
for (lev = 1; lev < 256; lev++) {
for (lev = 1; lev < 256 && res == 0; lev++) {
/* level numbers are kept in xchars in save.c, so the
* maximum level number (for the endlevel) must be < 256
*/
@@ -357,7 +356,10 @@ char *basename;
if (lfd >= 0) {
/* any or all of these may not exist */
levc = (xchar) lev;
write(sfd, (genericptr_t) &levc, sizeof(levc));
if (write(sfd, (genericptr_t) &levc, sizeof levc)
!= sizeof levc)
res = -1;
else
copy_bytes(lfd, sfd);
Close(lfd);
(void) unlink(lock);
@@ -369,7 +371,7 @@ char *basename;
#if 0 /* OBSOLETE, HackWB is no longer in use */
#ifdef AMIGA
{
if (res == 0) {
/* we need to create an icon for the saved game
* or HackWB won't notice the file.
*/
@@ -389,7 +391,7 @@ char *basename;
}
#endif /*AMIGA*/
#endif
return 0;
return res;
}
#ifdef EXEPATH