projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Without IGNORE, -Wunused-result throws a warning on fread(2).
[open-adventure.git]
/
saveresume.c
diff --git
a/saveresume.c
b/saveresume.c
index cf5a69626912d9bb166724c4d59ced0a48588a3a..3ec4ebd11b0aa1a192ea145e99c689d44295b616 100644
(file)
--- a/
saveresume.c
+++ b/
saveresume.c
@@
-26,6
+26,8
@@
struct save_t {
};
struct save_t save;
};
struct save_t save;
+#define IGNORE(r) do{if (r){}}while(0)
+
int savefile(FILE *fp, long version)
/* Save game to file. No input or output from user. */
{
int savefile(FILE *fp, long version)
/* Save game to file. No input or output from user. */
{
@@
-56,7
+58,8
@@
int suspend(void)
FILE *fp = NULL;
rspeak(SUSPEND_WARNING);
FILE *fp = NULL;
rspeak(SUSPEND_WARNING);
- if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ;
+ if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+ return GO_CLEAROBJ;
game.saved = game.saved + 5;
while (fp == NULL) {
game.saved = game.saved + 5;
while (fp == NULL) {
@@
-72,7
+75,7
@@
int suspend(void)
savefile(fp, VRSION);
fclose(fp);
rspeak(RESUME_HELP);
savefile(fp, VRSION);
fclose(fp);
rspeak(RESUME_HELP);
- exit(
0
);
+ exit(
EXIT_SUCCESS
);
}
int resume(void)
}
int resume(void)
@@
-87,7
+90,8
@@
int resume(void)
if (game.loc != 1 || game.abbrev[1] != 1) {
rspeak(RESUME_ABANDON);
if (game.loc != 1 || game.abbrev[1] != 1) {
rspeak(RESUME_ABANDON);
- if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ;
+ if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+ return GO_CLEAROBJ;
}
while (fp == NULL) {
}
while (fp == NULL) {