From 14dd68aa4e634a8d52f644c5a60a89711bc157f5 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 30 Apr 2011 22:14:02 +0000 Subject: Remove enum mcharst, which hasn't been used in quite some time. --- chars.c | 6 ++---- html.c | 4 ++-- man_term.c | 4 ++-- mandoc.h | 9 ++------- mdoc_term.c | 4 ++-- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/chars.c b/chars.c index 26539832..d3447524 100644 --- 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 * Copyright (c) 2011 Ingo Schwarze @@ -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 8f6005ad..f5f1e95e 100644 --- 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 * Copyright (c) 2011 Ingo Schwarze @@ -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 952c71c5..790f2850 100644 --- 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 * Copyright (c) 2010, 2011 Ingo Schwarze @@ -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 b42ce81e..58ff0fbc 100644 --- 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 * @@ -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 893935f2..8a0ff30e 100644 --- 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 * Copyright (c) 2010 Ingo Schwarze @@ -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(); -- cgit v1.2.3-56-ge451