=================================================================== RCS file: /cvs/mandoc/term_ascii.c,v retrieving revision 1.47 retrieving revision 1.49 diff -u -p -r1.47 -r1.49 --- mandoc/term_ascii.c 2015/07/17 22:38:29 1.47 +++ mandoc/term_ascii.c 2015/10/06 18:32:20 1.49 @@ -1,4 +1,4 @@ -/* $Id: term_ascii.c,v 1.47 2015/07/17 22:38:29 schwarze Exp $ */ +/* $Id: term_ascii.c,v 1.49 2015/10/06 18:32:20 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014, 2015 Ingo Schwarze @@ -115,28 +115,28 @@ ascii_init(enum termenc enc, const struct mchars *mcha if (outopts->synopsisonly) p->synopsisonly = 1; - return(p); + return p; } void * ascii_alloc(const struct mchars *mchars, const struct manoutput *outopts) { - return(ascii_init(TERMENC_ASCII, mchars, outopts)); + return ascii_init(TERMENC_ASCII, mchars, outopts); } void * utf8_alloc(const struct mchars *mchars, const struct manoutput *outopts) { - return(ascii_init(TERMENC_UTF8, mchars, outopts)); + return ascii_init(TERMENC_UTF8, mchars, outopts); } void * locale_alloc(const struct mchars *mchars, const struct manoutput *outopts) { - return(ascii_init(TERMENC_LOCALE, mchars, outopts)); + return ascii_init(TERMENC_LOCALE, mchars, outopts); } static void @@ -176,7 +176,7 @@ static size_t ascii_width(const struct termp *p, int c) { - return(1); + return 1; } void @@ -260,9 +260,8 @@ ascii_hspan(const struct termp *p, const struct roffsu break; default: abort(); - /* NOTREACHED */ } - return(r > 0.0 ? r + 0.01 : r - 0.01); + return r > 0.0 ? r + 0.01 : r - 0.01; } const char * @@ -337,8 +336,8 @@ ascii_uc2str(int uc) assert(uc >= 0); if ((size_t)uc < sizeof(tab)/sizeof(tab[0])) - return(tab[uc]); - return(mchars_uc2str(uc)); + return tab[uc]; + return mchars_uc2str(uc); } #if HAVE_WCHAR @@ -352,7 +351,7 @@ locale_width(const struct termp *p, int c) rc = wcwidth(c); if (rc < 0) rc = 0; - return(rc); + return rc; } static void