Lint fixes (no effect).

Versioning up.

diff --git a/Makefile b/Makefile
index f085166bf7523dec7644570058b19cfb0ac6a5ff..0ae00ff3c7b421ac163c0a8228eb6770d8b25c17 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ INSTALL_DATA    = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.7.14
-VDATE     = 11 June 2009
+VERSION           = 1.7.15
+VDATE     = 12 June 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g

diff --git a/mdoc.c b/mdoc.c
index 749e18b19fc4e26a1c2b7281677ed37fd2a486ae..b3ad3f9ee19433bdd86f265b870fabe9156afed7 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.76 2009/06/10 20:18:43 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.77 2009/06/12 12:52:51 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -480,7 +480,8 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
        p = node_alloc(mdoc, line, pos, tok, MDOC_BLOCK);
        if (NULL == p)
                return(0);
-       if ((p->args = args))
+       p->args = args;
+       if (p->args)
                (args->refcnt)++;
        return(node_append(mdoc, p));
 }
@@ -495,7 +496,8 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,
        p = node_alloc(mdoc, line, pos, tok, MDOC_ELEM);
        if (NULL == p)
                return(0);
-       if ((p->args = args))
+       p->args = args;
+       if (p->args)
                (args->refcnt)++;
        return(node_append(mdoc, p));
 }

diff --git a/mdoc_action.c b/mdoc_action.c
index 23da04f8525b1a24e5b399d96c0d53107ac4330f..bfc93da7b0e47e96772ac1b5389f622ae7eb8723 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.10 2009/06/12 09:18:00 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.11 2009/06/12 12:52:51 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -538,7 +538,8 @@ post_bl_tagwidth(struct mdoc *m)
         * width if a macro.
         */
 
-       if ((n = m->last->body->child)) {
+       n = m->last->body->child;
+       if (n) {
                assert(MDOC_BLOCK == n->type);
                assert(MDOC_It == n->tok);
                n = n->head->child;