Remove enum mcharst, which hasn't been used in quite some time.

diff --git a/chars.c b/chars.c
index 2653983256671ccc22cf116dcbf67b88086d7a06..d3447524c54a32a78684f28c0f3fb2e848721475 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*     $Id: chars.c,v 1.36 2011/04/29 22:18:12 kristaps Exp $ */
+/*     $Id: chars.c,v 1.37 2011/04/30 22:14:02 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -55,7 +55,6 @@ struct        ln {
 #include "chars.in"
 
 struct mchars {
-       enum mcharst      type;
        struct ln       **htab;
 };
 
@@ -72,7 +71,7 @@ mchars_free(struct mchars *arg)
 }
 
 struct mchars *
-mchars_init(enum mcharst type)
+mchars_init(void)
 {
        struct mchars    *tab;
        struct ln       **htab;
@@ -103,7 +102,6 @@ mchars_init(enum mcharst type)
        }
 
        tab->htab = htab;
-       tab->type = type;
        return(tab);
 }
 

diff --git a/html.c b/html.c
index 8f6005ad25a6d87aa592ad0c8cac7dbc54b3473f..f5f1e95e9ba42bb895a1a1d16b30052e2f613f79 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.134 2011/04/30 10:18:24 kristaps Exp $ */
+/*     $Id: html.c,v 1.135 2011/04/30 22:14:02 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -122,7 +122,7 @@ ml_alloc(char *outopts, enum htmltype type)
 
        h->type = type;
        h->tags.head = NULL;
-       h->symtab = mchars_init(MCHARS_HTML);
+       h->symtab = mchars_init();
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {

diff --git a/man_term.c b/man_term.c
index 952c71c57a23b2a2677cd18362188848ce88205f..790f285072b649084c02edaf6a9256c5963b5595 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.106 2011/04/29 22:18:12 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.107 2011/04/30 22:14:02 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -158,7 +158,7 @@ terminal_man(void *arg, const struct man *man)
        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):
-                       p->symtab = mchars_init(MCHARS_ASCII);
+                       p->symtab = mchars_init();
                        break;
                default:
                        abort();

diff --git a/mandoc.h b/mandoc.h
index b42ce81e178997eba2af765cc02a66c4ca010eae..58ff0fbcef9fc97f273b7854c4134fd0b45a0427 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.71 2011/04/29 22:18:12 kristaps Exp $ */
+/*     $Id: mandoc.h,v 1.72 2011/04/30 22:14:02 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -302,11 +302,6 @@ enum       mandoc_esc {
        ESCAPE_NOSPACE /* suppress space if the last on a line */
 };
 
-enum   mcharst {
-       MCHARS_ASCII, /* 7-bit ascii representation */
-       MCHARS_HTML /* unicode values */
-};
-
 typedef        void    (*mandocmsg)(enum mandocerr, enum mandoclevel,
                        const char *, int, int, const char *);
 
@@ -332,7 +327,7 @@ void                 *mandoc_realloc(void *, size_t);
 
 enum mandoc_esc          mandoc_escape(const char **, const char **, int *);
 
-struct mchars   *mchars_init(enum mcharst);
+struct mchars   *mchars_init(void);
 const char      *mchars_num2char(const char *, size_t);
 const char      *mchars_spec2str(struct mchars *, const char *, size_t, size_t *);
 int              mchars_spec2cp(struct mchars *, const char *, size_t);

diff --git a/mdoc_term.c b/mdoc_term.c
index 893935f2b08951ee4951d77fa152ca3805c84f2b..8a0ff30ef40929ca064ddb6cd53f1375c956c2f6 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.227 2011/04/29 22:18:12 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.228 2011/04/30 22:14:02 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -266,7 +266,7 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):
-                       p->symtab = mchars_init(MCHARS_ASCII);
+                       p->symtab = mchars_init();
                        break;
                default:
                        abort();