From 4744eeb765a081eeee7faa9bd2661d38094e548d Mon Sep 17 00:00:00 2001 From: Bart House Date: Fri, 23 Nov 2018 10:15:22 -0800 Subject: [PATCH] rfilter initialized to UNDEFINED. --- include/hack.h | 7 +++++++ src/decl.c | 2 -- src/role.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/hack.h b/include/hack.h index 5785b8590..3525e1695 100644 --- a/include/hack.h +++ b/include/hack.h @@ -22,6 +22,13 @@ 0 \ } +/* UNDEFINED and UNDEFINED_PTR are used to initialize variables whose + initialized value is not relied upon. UNDEFINED can be used to + initialized any value type except pointers. UNDEFINED_PTR can be used + only on pointer types. */ +#define UNDEFINED { 0 } +#define UNDEFINED_PTR NULL + /* symbolic names for capacity levels */ enum encumbrance_types { UNENCUMBERED = 0, diff --git a/src/decl.c b/src/decl.c index c8aaf7275..559969c39 100644 --- a/src/decl.c +++ b/src/decl.c @@ -325,8 +325,6 @@ decl_init() return; } -#define UNDEFINED { 0 } /* move to hack.h if we are keeping */ -#define UNDEFINED_PTR NULL /* move to hack.h if we are keeping */ #define IVMAGIC 0xdeadbeef const struct instance_globals g_init = { diff --git a/src/role.c b/src/role.c index 69adcab7b..b61babf7c 100644 --- a/src/role.c +++ b/src/role.c @@ -769,7 +769,7 @@ const struct Align aligns[] = { static struct { boolean roles[SIZE(roles)]; short mask; -} rfilter; +} rfilter = UNDEFINED; STATIC_DCL int NDECL(randrole_filtered); STATIC_DCL char *FDECL(promptsep, (char *, int)); -- 2.40.0