aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--mandoc.38
-rw-r--r--mandoc.c4
-rw-r--r--mandoc.h5
-rw-r--r--out.c5
-rw-r--r--roff.c4
5 files changed, 12 insertions, 14 deletions
diff --git a/mandoc.3 b/mandoc.3
index bc6aa904..b864e489 100644
--- a/mandoc.3
+++ b/mandoc.3
@@ -1,4 +1,4 @@
-.\" $Id: mandoc.3,v 1.20 2013/09/16 22:54:38 schwarze Exp $
+.\" $Id: mandoc.3,v 1.21 2013/10/05 20:30:05 schwarze Exp $
.\"
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
.\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 16 2013 $
+.Dd $Mdocdate: October 5 2013 $
.Dt MANDOC 3
.Os
.Sh NAME
@@ -50,8 +50,8 @@
.In mandoc.h
.Ft "enum mandoc_esc"
.Fo mandoc_escape
-.Fa "const char **end"
-.Fa "const char **start"
+.Fa "const char const **end"
+.Fa "const char const **start"
.Fa "int *sz"
.Fc
.Ft "const struct man_meta *"
diff --git a/mandoc.c b/mandoc.c
index df510226..963b5b49 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/* $Id: mandoc.c,v 1.68 2013/08/08 20:07:47 schwarze Exp $ */
+/* $Id: mandoc.c,v 1.69 2013/10/05 20:30:05 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -40,7 +40,7 @@ static char *time2a(time_t);
enum mandoc_esc
-mandoc_escape(const char **end, const char **start, int *sz)
+mandoc_escape(const char const **end, const char const **start, int *sz)
{
const char *local_start;
int local_sz;
diff --git a/mandoc.h b/mandoc.h
index c2406e95..5170b419 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/* $Id: mandoc.h,v 1.110 2013/09/16 00:25:07 schwarze Exp $ */
+/* $Id: mandoc.h,v 1.111 2013/10/05 20:30:05 schwarze Exp $ */
/*
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -400,7 +400,8 @@ struct man;
__BEGIN_DECLS
void *mandoc_calloc(size_t, size_t);
-enum mandoc_esc mandoc_escape(const char **, const char **, int *);
+enum mandoc_esc mandoc_escape(const char const **,
+ const char const **, int *);
void *mandoc_malloc(size_t);
void *mandoc_realloc(void *, size_t);
char *mandoc_strdup(const char *);
diff --git a/out.c b/out.c
index 1d8c8ab4..c9316649 100644
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/* $Id: out.c,v 1.45 2013/05/31 21:37:17 schwarze Exp $ */
+/* $Id: out.c,v 1.46 2013/10/05 20:30:05 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -142,7 +142,6 @@ void
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
{
const struct tbl_dat *dp;
- const struct tbl_head *hp;
struct roffcol *col;
int spans;
@@ -156,8 +155,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
tbl->cols = mandoc_calloc
((size_t)sp->opts->cols, sizeof(struct roffcol));
- hp = sp->head;
-
for ( ; sp; sp = sp->next) {
if (TBL_SPAN_DATA != sp->pos)
continue;
diff --git a/roff.c b/roff.c
index 3ee8adfe..062758ce 100644
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.178 2013/07/13 12:52:07 schwarze Exp $ */
+/* $Id: roff.c,v 1.179 2013/10/05 20:30:05 schwarze Exp $ */
/*
* Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -627,7 +627,7 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
/* Skip over escapes. */
p++;
esc = mandoc_escape
- ((const char **)&p, NULL, NULL);
+ ((const char const **)&p, NULL, NULL);
if (ESCAPE_ERROR == esc)
break;
continue;