A missing initialization could randomly cause regular expression

[mandoc.git] / mdoc_hash.c

diff --git a/mdoc_hash.c b/mdoc_hash.c
index 13cf227a2f252a0e88a00ac5049faed36b91e58a..cad3c2db1afb497a3848b654f39d8eee009a5a2d 100644 (file)
--- a/mdoc_hash.c
+++ b/mdoc_hash.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc_hash.c,v 1.25 2015/04/19 14:00:19 schwarze Exp $ */
+/*     $Id: mdoc_hash.c,v 1.27 2016/07/15 18:03:45 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -25,8 +26,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mandoc.h"
 #include "roff.h"
 #include "mdoc.h"
+#include "libmandoc.h"
 #include "libmdoc.h"
 
 static unsigned char    table[27 * 12];
@@ -67,26 +70,26 @@ mdoc_hash_find(const char *p)
        int               major, i, j;
 
        if (0 == p[0])
-               return(TOKEN_NONE);
+               return TOKEN_NONE;
        if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])
-               return(TOKEN_NONE);
+               return TOKEN_NONE;
 
        if (isalpha((unsigned char)p[1]))
                major = 12 * (tolower((unsigned char)p[1]) - 97);
        else if ('1' == p[1])
                major = 12 * 26;
        else
-               return(TOKEN_NONE);
+               return TOKEN_NONE;
 
        if (p[2] && p[3])
-               return(TOKEN_NONE);
+               return TOKEN_NONE;
 
        for (j = 0; j < 12; j++) {
                if (UCHAR_MAX == (i = table[major + j]))
                        break;
                if (0 == strcmp(p, mdoc_macronames[i]))
-                       return(i);
+                       return i;
        }
 
-       return(TOKEN_NONE);
+       return TOKEN_NONE;
 }