rfilter initialized to UNDEFINED.

diff --git a/include/hack.h b/include/hack.h
index 5785b8590f5894eb463e2ab71d8c92f31e5ddc2d..3525e1695e40215c73fd6122116e2a4d0f752c07 100644 (file)
--- 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 c8aaf72757bfd9dfede0896c064f791d8828d749..559969c395006fdba537b8997345127781a92cbf 100644 (file)
--- 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 69adcab7b6d787dcef560e2be7e92921c0c91e09..b61babf7c8ce2a4ba03db1504cc6d62926bd297b 100644 (file)
--- 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));