From 73e2a0150148f3765d7d8682498f3f5d293b62e9 Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Sun, 30 Nov 2003 05:54:02 +0000 Subject: [PATCH] unintentional change removal A recursive guard check was accidentally checked in with the status field stuff. Remove it. --- include/decl.h | 4 ---- src/files.c | 16 ++++++---------- src/pline.c | 4 ---- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/include/decl.h b/include/decl.h index dac11660e..734e8ec02 100644 --- a/include/decl.h +++ b/include/decl.h @@ -152,10 +152,6 @@ E NEARDATA struct sinfo { int panicking; /* `panic' is in progress */ #if defined(VMS) || defined(WIN32) int exiting; /* an exit handler is executing */ -#endif - int in_impossible; -#ifdef PANICLOG - int in_paniclog; #endif } program_state; diff --git a/src/files.c b/src/files.c index d2e3086dc..1cca1ca06 100644 --- a/src/files.c +++ b/src/files.c @@ -2275,16 +2275,12 @@ const char *reason; /* explanation */ FILE *lfile; char buf[BUFSZ]; - if (!program_state.in_paniclog) { - program_state.in_paniclog = 1; - lfile = fopen_datafile(PANICLOG, "a", TROUBLEPREFIX); - if (lfile) { - (void) fprintf(lfile, "%s %08ld: %s %s\n", - version_string(buf), yyyymmdd((time_t)0L), - type, reason); - (void) fclose(lfile); - } - program_state.in_paniclog = 0; + lfile = fopen_datafile(PANICLOG, "a", TROUBLEPREFIX); + if (lfile) { + (void) fprintf(lfile, "%s %08ld: %s %s\n", + version_string(buf), yyyymmdd((time_t)0L), + type, reason); + (void) fclose(lfile); } #endif /* PANICLOG */ return; diff --git a/src/pline.c b/src/pline.c index 60218fe15..2febc95f0 100644 --- a/src/pline.c +++ b/src/pline.c @@ -252,9 +252,6 @@ void impossible VA_DECL(const char *, s) VA_START(s); VA_INIT(s, const char *); - if (program_state.in_impossible) - panic("impossible called impossible"); - program_state.in_impossible = 1; { char pbuf[BUFSZ]; Vsprintf(pbuf,s,VA_ARGS); @@ -262,7 +259,6 @@ impossible VA_DECL(const char *, s) } vpline(s,VA_ARGS); pline("Program in disorder - perhaps you'd better #quit."); - program_state.in_impossible = 0; VA_END(); } -- 2.40.0