simplify a few accesses to fields of structs, using auxiliary pointer

variables that are already present (and used nearby) in the code;
no functional change

1 files changed, 4 insertions, 6 deletions

diff --git a/out.c b/out.c
index 9e0d704a..bb29f78c 100644
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.84 2021/10/17 20:48:28 schwarze Exp $ */
+/*	$Id: out.c,v 1.85 2021/10/17 21:05:54 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
@@ -247,13 +247,13 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
 				done = 1;
 				break;
 			} else
-				(*gp)->wanted -= width;
+				g->wanted -= width;
 		}
 		if (done) {
 			*gp = g->next;
 			free(g);
 		} else
-			gp = &(*gp)->next;
+			gp = &g->next;
 	}
 
 	colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth));
@@ -326,7 +326,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
 				*gp = g->next;
 				free(g);
 			} else
-				gp = &(*gp)->next;
+				gp = &g->next;
 		}
 	}
 	free(colwidth);
@@ -553,7 +553,5 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 		col->nwidth = totsz;
 	if (col->nwidth > col->width)
 		col->width = col->nwidth;
-	fprintf(stderr, "N=%zu D=%zu I=%zu T=%zu %s\n",
-	    col->nwidth, col->decimal, intsz, totsz, dp->string);
 	return totsz;
 }