From a2e966d93f52177b274c131fea83dafbf9890721 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Tue, 31 Dec 2013 23:23:10 +0000 Subject: Simplify: Remove an unused argument from the mandoc_eos() function. No functional change. --- libmandoc.h | 4 ++-- man.c | 4 ++-- man_macro.c | 4 ++-- mandoc.c | 10 +++++----- mdoc.c | 4 ++-- mdoc_macro.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libmandoc.h b/libmandoc.h index 3c005e10..192346a0 100644 --- a/libmandoc.h +++ b/libmandoc.h @@ -1,4 +1,4 @@ -/* $Id: libmandoc.h,v 1.35 2013/12/15 21:23:52 schwarze Exp $ */ +/* $Id: libmandoc.h,v 1.36 2013/12/31 23:23:10 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons * Copyright (c) 2013 Ingo Schwarze @@ -42,7 +42,7 @@ void mandoc_vmsg(enum mandocerr, struct mparse *, int, int, const char *, ...); char *mandoc_getarg(struct mparse *, char **, int, int *); char *mandoc_normdate(struct mparse *, char *, int, int); -int mandoc_eos(const char *, size_t, int); +int mandoc_eos(const char *, size_t); int mandoc_strntoi(const char *, size_t, int); const char *mandoc_a2msec(const char*); diff --git a/man.c b/man.c index e6e1c289..72c6afab 100644 --- a/man.c +++ b/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.121 2013/11/10 22:54:40 schwarze Exp $ */ +/* $Id: man.c,v 1.122 2013/12/31 23:23:10 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * @@ -479,7 +479,7 @@ man_ptext(struct man *man, int line, char *buf, int offs) */ assert(i); - if (mandoc_eos(buf, (size_t)i, 0)) + if (mandoc_eos(buf, (size_t)i)) man->last->flags |= MAN_EOS; return(man_descope(man, line, offs)); diff --git a/man_macro.c b/man_macro.c index 479d0484..782f8322 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.79 2013/12/25 00:50:05 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.80 2013/12/31 23:23:10 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2012, 2013 Ingo Schwarze @@ -438,7 +438,7 @@ in_line_eoln(MACRO_PROT_ARGS) */ if (n != man->last && - mandoc_eos(man->last->string, strlen(man->last->string), 0)) + mandoc_eos(man->last->string, strlen(man->last->string))) man->last->flags |= MAN_EOS; /* diff --git a/mandoc.c b/mandoc.c index da738f20..b3928ae4 100644 --- a/mandoc.c +++ b/mandoc.c @@ -1,4 +1,4 @@ -/* $Id: mandoc.c,v 1.74 2013/12/30 18:30:32 schwarze Exp $ */ +/* $Id: mandoc.c,v 1.75 2013/12/31 23:23:10 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013 Ingo Schwarze @@ -594,10 +594,10 @@ mandoc_normdate(struct mparse *parse, char *in, int ln, int pos) } int -mandoc_eos(const char *p, size_t sz, int enclosed) +mandoc_eos(const char *p, size_t sz) { - const char *q; - int found; + const char *q; + int enclosed, found; if (0 == sz) return(0); @@ -608,7 +608,7 @@ mandoc_eos(const char *p, size_t sz, int enclosed) * propagate outward. */ - found = 0; + enclosed = found = 0; for (q = p + (int)sz - 1; q >= p; q--) { switch (*q) { case ('\"'): diff --git a/mdoc.c b/mdoc.c index 87b35879..58100277 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.206 2013/12/24 19:11:46 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.207 2013/12/31 23:23:11 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013 Ingo Schwarze @@ -846,7 +846,7 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs) assert(buf < end); - if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0)) + if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) mdoc->last->flags |= MDOC_EOS; return(1); diff --git a/mdoc_macro.c b/mdoc_macro.c index ba36227d..9de7dfb3 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.126 2013/12/31 22:40:12 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.127 2013/12/31 23:23:11 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013 Ingo Schwarze @@ -683,7 +683,7 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) * knowing which symbols break this behaviour, for * example, `. ;' shouldn't propagate the double-space. */ - if (mandoc_eos(p, strlen(p), 0)) + if (mandoc_eos(p, strlen(p))) mdoc->last->flags |= MDOC_EOS; } -- cgit v1.2.3-56-ge451