tagging issues from weerd@ regarding hyphens

[mandoc.git] / mansearch.h

diff --git a/mansearch.h b/mansearch.h
index acad65da2fb3c0f1bce7d5611413d9ed36ee1cce..8a0aa121d0c6a50404fc37cdb7d197248c4362d9 100644 (file)
--- a/mansearch.h
+++ b/mansearch.h
@@ -1,7 +1,7 @@
-/*     $Id: mansearch.h,v 1.25 2016/07/19 21:31:55 schwarze Exp $ */
+/*     $Id: mansearch.h,v 1.30 2019/04/30 18:51:57 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013, 2014, 2016, 2017 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
@@ -16,11 +16,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define        MANDOC_DB        "mandoc.new.db"
+#define        MANDOC_DB        "mandoc.db"
 #define        MANDOCDB_MAGIC   0x3a7d0cdb
-#define        MANDOCDB_VERSION 0  /* XXX Start counting in production. */
+#define        MANDOCDB_VERSION 1
 
 #define        MACRO_MAX        36
+#define        KEY_arch         0
+#define        KEY_sec          1
+#define        KEY_Nm           38
 #define        KEY_Nd           39
 #define        KEY_MAX          40
 
@@ -89,8 +92,8 @@ struct        manpage {
        char            *file; /* to be prefixed by manpath */
        char            *names; /* a list of names with sections */
        char            *output; /* user-defined additional output */
-       size_t           ipath; /* number of the manpath */
        uint64_t         bits; /* name type mask */
+       size_t           ipath; /* number of the manpath */
        int              sec; /* section number, 10 means invalid */
        enum form        form;
 };