From f4174d477ac34e47067d4a9e45cc192f7271973a Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 8 Mar 2009 14:01:46 +0000 Subject: [PATCH] Bumped minor-number. All sources converted to new schema. --- Makefile | 4 ++-- mdoctree.c | 18 +++++++++++------- term.c | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index c10d60a3..b9928f58 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .SUFFIXES: .html .sgml -VERSION = 1.3.19 -VDATE = 05 March 2009 +VERSION = 1.4.1 +VDATE = 8 March 2009 BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include diff --git a/mdoctree.c b/mdoctree.c index acc0a03b..65070348 100644 --- a/mdoctree.c +++ b/mdoctree.c @@ -1,4 +1,4 @@ - /* $Id: mdoctree.c,v 1.5 2009/03/06 14:13:47 kristaps Exp $ */ + /* $Id: mdoctree.c,v 1.6 2009/03/08 14:01:46 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -57,7 +57,7 @@ doprint(const struct mdoc_node *n, int indent) int i, j; size_t argc, sz; char **params; - struct mdoc_arg *argv; + struct mdoc_argv *argv; argv = NULL; argc = sz = 0; @@ -92,7 +92,7 @@ doprint(const struct mdoc_node *n, int indent) switch (n->type) { case (MDOC_TEXT): - p = n->data.text.string; + p = n->string; break; case (MDOC_BODY): p = mdoc_macronames[n->tok]; @@ -105,13 +105,17 @@ doprint(const struct mdoc_node *n, int indent) break; case (MDOC_ELEM): p = mdoc_macronames[n->tok]; - argv = n->data.elem.argv; - argc = n->data.elem.argc; + if (n->args) { + argv = n->args->argv; + argc = n->args->argc; + } break; case (MDOC_BLOCK): p = mdoc_macronames[n->tok]; - argv = n->data.block.argv; - argc = n->data.block.argc; + if (n->args) { + argv = n->args->argv; + argc = n->args->argc; + } break; case (MDOC_ROOT): p = "root"; diff --git a/term.c b/term.c index d99fbd29..0aeaecfb 100644 --- a/term.c +++ b/term.c @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.45 2009/03/08 13:57:07 kristaps Exp $ */ +/* $Id: term.c,v 1.46 2009/03/08 14:01:46 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -316,7 +316,7 @@ arg_listtype(const struct mdoc_node *n) assert(MDOC_BLOCK == n->type); - len = n->args ? n->args->argc : 0; + len = (int)(n->args ? n->args->argc : 0); for (i = 0; i < len; i++) switch (n->args->argv[i].arg) { -- 2.47.1