From 07e7b8131ee6a4424cf269fe1ebc310037cf1d0f Mon Sep 17 00:00:00 2001 From: "Jason S. Ninneman" Date: Mon, 3 Jul 2017 10:37:44 -0700 Subject: [PATCH] Upgrade get_vocab_id() to handle empty strings. --- advent.h | 1 + misc.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/advent.h b/advent.h index 71b281e..72af32f 100644 --- a/advent.h +++ b/advent.h @@ -20,6 +20,7 @@ #define PANICTIME 15 // time left after closing #define BATTERYLIFE 2500 // turn limit increment from batteries #define WORD_NOT_FOUND -1 // "Word not found" flag value for the vocab hash functions. +#define WORD_EMPTY 0 // "Word empty" flag value for the vocab hash functions #define CARRIED -1 // Player is toting it #define READ_MODE "rb" // b is not needed for POSIX but harmless #define WRITE_MODE "wb" // b is not needed for POSIX but harmless diff --git a/misc.c b/misc.c index 2b6a58b..6e3656f 100644 --- a/misc.c +++ b/misc.c @@ -483,6 +483,10 @@ int get_special_vocab_id(const char* word) long get_vocab_id(const char* word) // Search the vocab categories in order for the supplied word. { + /* Check for an empty string */ + if (strncmp(word, "", sizeof("")) == 0) + return (WORD_EMPTY); + long ref_num; /* FIXME: Magic numbers related to vocabulary */ -- 2.31.1