===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- docbook2mdoc/docbook2mdoc.c	2019/04/03 14:02:07	1.85
+++ docbook2mdoc/docbook2mdoc.c	2019/04/03 15:05:08	1.86
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.85 2019/04/03 14:02:07 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.86 2019/04/03 15:05:08 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -201,25 +201,17 @@ pnode_printrefmeta(struct format *p, struct pnode *pn)
 }
 
 static void
-pnode_printfuncdef(struct format *p, struct pnode *pn)
+pnode_printfuncdef(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp, *ftype, *func;
+	struct pnode	*nc;
 
-	ftype = func = NULL;
-	TAILQ_FOREACH(pp, &pn->childq, child) {
-		if (pp->node == NODE_TEXT)
-			ftype = pp;
-		else if (pp->node == NODE_FUNCTION)
-			func = pp;
+	nc = TAILQ_FIRST(&n->childq);
+	if (nc != NULL && nc->node == NODE_TEXT) {
+		macro_argline(f, "Ft", nc->b);
+		pnode_unlink(nc);
 	}
-	if (ftype != NULL)
-		macro_argline(p, "Ft", ftype->b);
-	macro_open(p, "Fo");
-	if (func == NULL)
-		macro_addarg(p, "UNKNOWN", ARG_SPACE);
-	else
-		macro_addnode(p, func, ARG_SPACE | ARG_SINGLE);
-	macro_close(p);
+	macro_nodeline(f, "Fo", n, ARG_SINGLE);
+	pnode_unlinksub(n);
 }
 
 /*
@@ -288,14 +280,14 @@ pnode_printfuncprototype(struct format *p, struct pnod
 		if (fdef->node == NODE_FUNCDEF)
 			break;
 
-	if (fdef != NULL)
+	if (fdef != NULL) {
 		pnode_printfuncdef(p, fdef);
-	else
+		pnode_unlink(fdef);
+	} else
 		macro_line(p, "Fo UNKNOWN");
 
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node == NODE_PARAMDEF)
-			macro_nodeline(p, "Fa", pp, ARG_SINGLE);
+		macro_nodeline(p, "Fa", pp, ARG_SINGLE);
 
 	macro_line(p, "Fc");
 	pnode_unlinksub(pn);