From 8ea5dc6d40c942157256ddd510bd3fa16cb44303 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 30 Jan 2015 02:09:04 +0000 Subject: Auditing the tbl(7) code for more NULL pointer accesses, i came out empty-handed; so this is just KNF and some code simplifications, no functional change. --- tbl_html.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tbl_html.c') diff --git a/tbl_html.c b/tbl_html.c index 1de1bb8b..40abb42f 100644 --- a/tbl_html.c +++ b/tbl_html.c @@ -1,4 +1,4 @@ -/* $Id: tbl_html.c,v 1.13 2014/10/14 02:16:06 schwarze Exp $ */ +/* $Id: tbl_html.c,v 1.14 2015/01/30 02:09:04 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -54,7 +54,7 @@ html_tblopen(struct html *h, const struct tbl_span *sp) struct roffsu su; struct roffcol *col; - if (TBL_SPAN_FIRST & sp->flags) { + if (sp->flags & TBL_SPAN_FIRST) { h->tbl.len = html_tbl_len; h->tbl.slen = html_tbl_strlen; tblcalc(&h->tbl, sp, 0); @@ -95,7 +95,7 @@ print_tbl(struct html *h, const struct tbl_span *sp) /* Inhibit printing of spaces: we do padding ourselves. */ - if (NULL == h->tblt) + if (h->tblt == NULL) html_tblopen(h, sp); assert(h->tblt); @@ -118,10 +118,10 @@ print_tbl(struct html *h, const struct tbl_span *sp) print_stagq(h, tt); print_otag(h, TAG_TD, 0, NULL); - if (NULL == dp) + if (dp == NULL) break; - if (TBL_CELL_DOWN != dp->layout->pos) - if (dp->string) + if (dp->layout->pos != TBL_CELL_DOWN) + if (dp->string != NULL) print_text(h, dp->string); dp = dp->next; } @@ -132,7 +132,7 @@ print_tbl(struct html *h, const struct tbl_span *sp) h->flags &= ~HTML_NONOSPACE; - if (TBL_SPAN_LAST & sp->flags) { + if (sp->flags & TBL_SPAN_LAST) { assert(h->tbl.cols); free(h->tbl.cols); h->tbl.cols = NULL; -- cgit v1.2.3