diff options
-rw-r--r-- | action.c | 11 | ||||
-rw-r--r-- | term.h | 4 | ||||
-rw-r--r-- | validate.c | 5 |
3 files changed, 12 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $Id: action.c,v 1.47 2009/03/21 09:42:07 kristaps Exp $ */ +/* $Id: action.c,v 1.48 2009/03/21 09:48:29 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> * @@ -405,7 +405,8 @@ post_dt(POST_ARGS) * arch = NULL */ - if ((cp = mdoc_a2msec(n->string))) { + cp = mdoc_a2msec(n->string); + if (cp) { m->meta.vol = xstrdup(cp); errno = 0; lval = strtol(n->string, &ep, 10); @@ -424,7 +425,8 @@ post_dt(POST_ARGS) * VOL */ - if ((cp = mdoc_a2vol(n->string))) { + cp = mdoc_a2vol(n->string); + if (cp) { free(m->meta.vol); m->meta.vol = xstrdup(cp); n = n->next; @@ -489,7 +491,8 @@ post_bl_tagwidth(struct mdoc *m) * width if a macro. */ - if ((n = n->head->child)) { + n = n->head->child; + if (n) { if (MDOC_TEXT != n->type) { if (0 == (sz = (int)mdoc_macro2len(n->tok))) sz = -1; @@ -1,4 +1,4 @@ -/* $Id: term.h,v 1.29 2009/03/20 15:14:01 kristaps Exp $ */ +/* $Id: term.h,v 1.30 2009/03/21 09:48:30 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se> * @@ -73,7 +73,7 @@ struct termpair { (termp)->flags |= (fl); \ (p)->flag = (fl); \ (p)->type |= TERMPAIR_FLAG; \ - } while (0) + } while ( /* CONSTCOND */ 0) struct termact { int (*pre)(struct termp *, struct termpair *, @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.87 2009/03/21 09:42:07 kristaps Exp $ */ +/* $Id: validate.c,v 1.88 2009/03/21 09:48:30 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> * @@ -707,7 +707,8 @@ check_text(struct mdoc *mdoc, int line, int pos, const char *p) if ('\\' != *p) continue; - if ((c = mdoc_isescape(p))) { + c = mdoc_isescape(p); + if (c) { p += (int)c - 1; continue; } |