diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-30 02:09:04 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-30 02:09:04 +0000 |
commit | 8ea5dc6d40c942157256ddd510bd3fa16cb44303 (patch) | |
tree | 79e6a90e244253f4314dc4dc3773abea58b3d267 /tbl.c | |
parent | 8330e5fd370ea4633052bdaece49563be0db086b (diff) | |
download | mandoc-8ea5dc6d40c942157256ddd510bd3fa16cb44303.tar.gz mandoc-8ea5dc6d40c942157256ddd510bd3fa16cb44303.tar.zst mandoc-8ea5dc6d40c942157256ddd510bd3fa16cb44303.zip |
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.
Diffstat (limited to 'tbl.c')
-rw-r--r-- | tbl.c | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl.c,v 1.36 2015/01/28 17:32:07 schwarze Exp $ */ +/* $Id: tbl.c,v 1.37 2015/01/30 02:09:04 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -91,7 +91,7 @@ tbl_alloc(int pos, int line, struct mparse *parse) { struct tbl_node *tbl; - tbl = mandoc_calloc(1, sizeof(struct tbl_node)); + tbl = mandoc_calloc(1, sizeof(*tbl)); tbl->line = line; tbl->pos = pos; tbl->parse = parse; @@ -110,9 +110,9 @@ tbl_free(struct tbl_node *tbl) struct tbl_dat *dp; struct tbl_head *hp; - while (NULL != (rp = tbl->first_row)) { + while ((rp = tbl->first_row) != NULL) { tbl->first_row = rp->next; - while (rp->first) { + while (rp->first != NULL) { cp = rp->first; rp->first = cp->next; free(cp); @@ -120,19 +120,18 @@ tbl_free(struct tbl_node *tbl) free(rp); } - while (NULL != (sp = tbl->first_span)) { + while ((sp = tbl->first_span) != NULL) { tbl->first_span = sp->next; - while (sp->first) { + while (sp->first != NULL) { dp = sp->first; sp->first = dp->next; - if (dp->string) - free(dp->string); + free(dp->string); free(dp); } free(sp); } - while (NULL != (hp = tbl->first_head)) { + while ((hp = tbl->first_head) != NULL) { tbl->first_head = hp->next; free(hp); } |