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. --- tbl_term.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tbl_term.c') diff --git a/tbl_term.c b/tbl_term.c index c154a0e9..3dda00d1 100644 --- a/tbl_term.c +++ b/tbl_term.c @@ -1,7 +1,7 @@ -/* $Id: tbl_term.c,v 1.57 2017/07/31 16:14:10 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.58 2018/08/18 16:44:55 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons - * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze + * Copyright (c) 2011-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 @@ -621,7 +621,7 @@ tbl_number(struct termp *tp, const struct tbl_opts *opts, { char *cp; char buf[2]; - size_t sz, psz, ssz, d, padl; + size_t sz, ssz, d, padl; int i; /* @@ -636,16 +636,14 @@ tbl_number(struct termp *tp, const struct tbl_opts *opts, buf[0] = opts->decimal; buf[1] = '\0'; - psz = term_strlen(tp, buf); - if ((cp = strrchr(dp->string, opts->decimal)) != NULL) { for (ssz = 0, i = 0; cp != &dp->string[i]; i++) { buf[0] = dp->string[i]; ssz += term_strlen(tp, buf); } - d = ssz + psz; + d = ssz; } else - d = sz + psz; + d = sz; if (col->decimal > d && col->width > sz) { padl = col->decimal - d; -- cgit v1.2.3