===================================================================
RCS file: /cvs/mandoc/mdoc_argv.c,v
retrieving revision 1.34
retrieving revision 1.40
diff -u -p -r1.34 -r1.40
--- mandoc/mdoc_argv.c	2010/03/29 19:28:04	1.34
+++ mandoc/mdoc_argv.c	2010/05/07 05:54:09	1.40
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_argv.c,v 1.34 2010/03/29 19:28:04 kristaps Exp $ */
+/*	$Id: mdoc_argv.c,v 1.40 2010/05/07 05:54:09 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -44,8 +44,8 @@
 
 #define	MULTI_STEP	 5
 
-static	int		 argv_a2arg(int, const char *);
-static	int		 args(struct mdoc *, int, int *, 
+static	int		 argv_a2arg(enum mdoct, const char *);
+static	enum margserr	 args(struct mdoc *, int, int *, 
 				char *, int, char **);
 static	int		 argv(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
@@ -217,8 +217,8 @@ static	int mdoc_argflags[MDOC_MAX] = {
  * [value0...], which may either have a single mandatory value, at least
  * one mandatory value, an optional single value, or no value.
  */
-int
-mdoc_argv(struct mdoc *m, int line, int tok,
+enum margverr
+mdoc_argv(struct mdoc *m, int line, enum mdoct tok,
 		struct mdoc_arg **v, int *pos, char *buf)
 {
 	char		 *p, sv;
@@ -288,7 +288,7 @@ mdoc_argv(struct mdoc *m, int line, int tok,
 void
 mdoc_argv_free(struct mdoc_arg *p)
 {
-	int		 i, j;
+	int		 i;
 
 	if (NULL == p)
 		return;
@@ -300,27 +300,32 @@ mdoc_argv_free(struct mdoc_arg *p)
 	}
 	assert(p->argc);
 
-	/* LINTED */
-	for (i = 0; i < (int)p->argc; i++) {
-		if (0 == p->argv[i].sz)
-			continue;
-		if (NULL == p->argv[i].value)
-			continue;
+	for (i = (int)p->argc - 1; i >= 0; i--)
+		mdoc_argn_free(p, i);
 
-		/* LINTED */
-		for (j = 0; j < (int)p->argv[i].sz; j++) 
-			if (p->argv[i].value[j])
-				free(p->argv[i].value[j]);
+	free(p->argv);
+	free(p);
+}
 
-		free(p->argv[i].value);
+
+void
+mdoc_argn_free(struct mdoc_arg *p, int iarg)
+{
+	struct mdoc_argv *arg = &p->argv[iarg];
+	int		  j;
+
+	if (arg->sz && arg->value) {
+		for (j = (int)arg->sz - 1; j >= 0; j--) 
+			free(arg->value[j]);
+		free(arg->value);
 	}
 
-	free(p->argv);
-	free(p);
+	for (--p->argc; iarg < (int)p->argc; iarg++)
+		p->argv[iarg] = p->argv[iarg+1];
 }
 
 
-int
+enum margserr
 mdoc_zargs(struct mdoc *m, int line, int *pos, 
 		char *buf, int flags, char **v)
 {
@@ -329,14 +334,14 @@ mdoc_zargs(struct mdoc *m, int line, int *pos, 
 }
 
 
-int
-mdoc_args(struct mdoc *m, int line, 
-		int *pos, char *buf, int tok, char **v)
+enum margserr
+mdoc_args(struct mdoc *m, int line, int *pos, 
+		char *buf, enum mdoct tok, char **v)
 {
 	int		  fl, c, i;
 	struct mdoc_node *n;
 
-	fl = (0 == tok) ? 0 : mdoc_argflags[tok];
+	fl = mdoc_argflags[tok];
 
 	if (MDOC_It != tok)
 		return(args(m, line, pos, buf, fl, v));
@@ -367,7 +372,7 @@ mdoc_args(struct mdoc *m, int line, 
 }
 
 
-static int
+static enum margserr
 args(struct mdoc *m, int line, int *pos, 
 		char *buf, int fl, char **v)
 {
@@ -552,7 +557,7 @@ args(struct mdoc *m, int line, int *pos, 
 
 
 static int
-argv_a2arg(int tok, const char *p)
+argv_a2arg(enum mdoct tok, const char *p)
 {
 
 	/*