===================================================================
RCS file: /cvs/mandoc/mdoc_argv.c,v
retrieving revision 1.98
retrieving revision 1.100
diff -u -p -r1.98 -r1.100
--- mandoc/mdoc_argv.c	2014/11/28 23:21:32	1.98
+++ mandoc/mdoc_argv.c	2015/02/04 18:59:45	1.100
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mdoc_argv.c,v 1.98 2014/11/28 23:21:32 schwarze Exp $ */
+/*	$Id: mdoc_argv.c,v 1.100 2015/02/04 18:59:45 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -339,7 +339,7 @@ mdoc_argv(struct mdoc *mdoc, int line, enum mdoct tok,
 		/* Parse the arguments of the flag. */
 
 		tmpv.line  = line;
-		tmpv.pos   = ipos;
+		tmpv.pos   = *pos;
 		tmpv.sz    = 0;
 		tmpv.value = NULL;
 
@@ -412,22 +412,17 @@ argn_free(struct mdoc_arg *p, int iarg)
 }
 
 enum margserr
-mdoc_zargs(struct mdoc *mdoc, int line, int *pos, char *buf, char **v)
-{
-
-	return(args(mdoc, line, pos, buf, ARGSFL_NONE, v));
-}
-
-enum margserr
 mdoc_args(struct mdoc *mdoc, int line, int *pos,
 		char *buf, enum mdoct tok, char **v)
 {
-	enum argsflag	  fl;
 	struct mdoc_node *n;
+	char		 *v_local;
+	enum argsflag	  fl;
 
-	fl = mdocargs[tok].flags;
-
-	if (MDOC_It != tok)
+	if (v == NULL)
+		v = &v_local;
+	fl = tok == MDOC_MAX ? ARGSFL_NONE : mdocargs[tok].flags;
+	if (tok != MDOC_It)
 		return(args(mdoc, line, pos, buf, fl, v));
 
 	/*