- avoid bad qualifier casting in roff.c, roff_parsetext()
by changing the mandoc_escape arguments to "const char const **"
- avoid bad qualifier casting in mandocdb.c, index_merge()
- do not complain about unused variables in test-*.c
- garbage collect a few unused variables elsewhere
-.\" $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>
.\"
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
.\" Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\" 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
.Dt MANDOC 3
.Os
.Sh NAME
.In mandoc.h
.Ft "enum mandoc_esc"
.Fo mandoc_escape
.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 *"
.Fa "int *sz"
.Fc
.Ft "const struct man_meta *"
-/* $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>
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
-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;
{
const char *local_start;
int local_sz;
-/* $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>
/*
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
__BEGIN_DECLS
void *mandoc_calloc(size_t, size_t);
__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 *);
void *mandoc_malloc(size_t);
void *mandoc_realloc(void *, size_t);
char *mandoc_strdup(const char *);
-/* $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>
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
{
const struct tbl_dat *dp;
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
{
const struct tbl_dat *dp;
- const struct tbl_head *hp;
struct roffcol *col;
int spans;
struct roffcol *col;
int spans;
tbl->cols = mandoc_calloc
((size_t)sp->opts->cols, sizeof(struct roffcol));
tbl->cols = mandoc_calloc
((size_t)sp->opts->cols, sizeof(struct roffcol));
for ( ; sp; sp = sp->next) {
if (TBL_SPAN_DATA != sp->pos)
continue;
for ( ; sp; sp = sp->next) {
if (TBL_SPAN_DATA != sp->pos)
continue;
-/* $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>
/*
* Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
/* Skip over escapes. */
p++;
esc = mandoc_escape
/* Skip over escapes. */
p++;
esc = mandoc_escape
- ((const char **)&p, NULL, NULL);
+ ((const char const **)&p, NULL, NULL);
if (ESCAPE_ERROR == esc)
break;
continue;
if (ESCAPE_ERROR == esc)
break;
continue;