aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Spörlein <uqs@FreeBSD.org>2014-01-31 23:04:19 +0000
committerUlrich Spörlein <uqs@FreeBSD.org>2014-01-31 23:04:19 +0000
commit53f5f26c3e5c6d5c310f44f1882afbd9cdd0297b (patch)
treed7b35c234d3d069b444ab7a093f25d22a70d4db5
parent3d011e300bd9608b1a158e0da873026a1a09517b (diff)
downloadsrc-53f5f26c3e5c6d5c310f44f1882afbd9cdd0297b.tar.gz
src-53f5f26c3e5c6d5c310f44f1882afbd9cdd0297b.zip
Really import mdocml version 1.12.3 and not a preliminary tarball.vendor/mandoc/1.12.3
Notes
Notes: svn path=/vendor/mdocml/dist/; revision=261331 svn path=/vendor/mdocml/1.12.3/; revision=261335; tag=vendor/mandoc/1.12.3
-rw-r--r--mandoc.c4
-rw-r--r--mandoc.h5
-rw-r--r--roff.c5
3 files changed, 6 insertions, 8 deletions
diff --git a/mandoc.c b/mandoc.c
index 58e3aca34ba9..da738f20fa72 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/* $Id: mandoc.c,v 1.73 2013/12/26 02:55:28 schwarze Exp $ */
+/* $Id: mandoc.c,v 1.74 2013/12/30 18:30:32 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 const **end, const char const **start, int *sz)
+mandoc_escape(const char **end, const char **start, int *sz)
{
const char *local_start;
int local_sz;
diff --git a/mandoc.h b/mandoc.h
index 5170b419b907..4c6a32f7a62d 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/* $Id: mandoc.h,v 1.111 2013/10/05 20:30:05 schwarze Exp $ */
+/* $Id: mandoc.h,v 1.112 2013/12/30 18:30:32 schwarze Exp $ */
/*
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -400,8 +400,7 @@ struct man;
__BEGIN_DECLS
void *mandoc_calloc(size_t, size_t);
-enum mandoc_esc mandoc_escape(const char const **,
- const char const **, int *);
+enum mandoc_esc mandoc_escape(const char **, const char **, int *);
void *mandoc_malloc(size_t);
void *mandoc_realloc(void *, size_t);
char *mandoc_strdup(const char *);
diff --git a/roff.c b/roff.c
index e33216c40970..42240d21fe60 100644
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.188 2013/12/25 00:50:05 schwarze Exp $ */
+/* $Id: roff.c,v 1.189 2013/12/30 18:44:06 schwarze Exp $ */
/*
* Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -646,8 +646,7 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
if ('\\' == *p) {
/* Skip over escapes. */
p++;
- esc = mandoc_escape
- ((const char const **)&p, NULL, NULL);
+ esc = mandoc_escape((const char **)&p, NULL, NULL);
if (ESCAPE_ERROR == esc)
break;
continue;