From d88097f26ac5c01fd8ce0480ac8da79069610527 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 18 Aug 2018 16:44:55 +0000 Subject: Do not allocate a column for decimal points if all numbers are integers. --- out.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'out.c') diff --git a/out.c b/out.c index b2b64378..eacfcb4f 100644 --- a/out.c +++ b/out.c @@ -1,7 +1,7 @@ -/* $Id: out.c,v 1.70 2017/06/27 18:25:02 schwarze Exp $ */ +/* $Id: out.c,v 1.71 2018/08/18 16:44:55 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze + * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -320,7 +320,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col, const struct tbl_opts *opts, const struct tbl_dat *dp) { int i; - size_t sz, psz, ssz, d; + size_t sz, ssz, d; const char *str; char *cp; char buf[2]; @@ -342,17 +342,15 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col, buf[0] = opts->decimal; buf[1] = '\0'; - psz = (*tbl->slen)(buf, tbl->arg); - if (NULL != (cp = strrchr(str, opts->decimal))) { buf[1] = '\0'; for (ssz = 0, i = 0; cp != &str[i]; i++) { buf[0] = str[i]; ssz += (*tbl->slen)(buf, tbl->arg); } - d = ssz + psz; + d = ssz; } else - d = sz + psz; + d = sz; /* Adjust the settings for this column. */ -- cgit v1.2.3-56-ge451