X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=4b9ac2c1e8253eb28a9fc2ee6965d50fd90dfa0f;hp=d33bc510c9b7fa05d500c569df9cc7f7a4e5585e;hb=342994376a6cc0fc9623cece2b9b85a7557ca47f;hpb=8bd947b54d365f4e8a119be761021be055ea8748 diff --git a/misc.c b/misc.c index d33bc51..4b9ac2c 100644 --- a/misc.c +++ b/misc.c @@ -113,7 +113,7 @@ static void vspeak(const char* msg, bool blank, va_list ap) // Unmodified string specifier. if (msg[i] == 's') { char *arg = va_arg(ap, char *); - strncat(renderp, arg, size); + strncat(renderp, arg, size-1); size_t len = strlen(renderp); renderp += len; size -= len; @@ -378,7 +378,7 @@ bool yes(const char* question, const char* yes_response, const char* no_response /* Data structure routines */ -int get_motion_vocab_id(const char* word) +static int get_motion_vocab_id(const char* word) // Return the first motion number that has 'word' as one of its words. { for (int i = 0; i < NMOTIONS; ++i) { @@ -393,7 +393,7 @@ int get_motion_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_object_vocab_id(const char* word) +static int get_object_vocab_id(const char* word) // Return the first object number that has 'word' as one of its words. { for (int i = 0; i < NOBJECTS + 1; ++i) { // FIXME: the + 1 should go when 1-indexing for objects is removed @@ -406,7 +406,7 @@ int get_object_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_action_vocab_id(const char* word) +static int get_action_vocab_id(const char* word) // Return the first motion number that has 'word' as one of its words. { for (int i = 0; i < NACTIONS; ++i) { @@ -421,7 +421,7 @@ int get_action_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_special_vocab_id(const char* word) +static int get_special_vocab_id(const char* word) // Return the first special number that has 'word' as one of its words. { for (int i = 0; i < NSPECIALS; ++i) {