From af94a81e5e9f3c6167efd1312e8b29bb15b296eb Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 12 Sep 2014 22:22:41 +0200 Subject: [PATCH] Slightly improve `number_set_show'. --- lib/numberset.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/numberset.c b/lib/numberset.c index aa2e3a5..424e3a3 100644 --- a/lib/numberset.c +++ b/lib/numberset.c @@ -375,8 +375,11 @@ number_set_show(number_range* number_set, comma = (s_len == 1) ? "" : ", "; - if (nr->start <= min - && nr->end >= max) + if (nr->start == nr->end) + tmp_len = sprintf(tmp, "%s%i", + comma, nr->start); + else if (nr->start <= min + && nr->end >= max) tmp_len = sprintf(tmp, "-"); else if (nr->start <= min) tmp_len = sprintf(tmp, "-%i", @@ -385,14 +388,8 @@ number_set_show(number_range* number_set, tmp_len = sprintf(tmp, "%s%i-", comma, nr->start); else - { - if (nr->start == nr->end) - tmp_len = sprintf(tmp, "%s%i", - comma, nr->start); - else - tmp_len = sprintf(tmp, "%s%i-%i", - comma, nr->start, nr->end); - } + tmp_len = sprintf(tmp, "%s%i-%i", + comma, nr->start, nr->end); s_len_new = s_len + tmp_len; s_new = (char*)realloc(s, s_len_new); -- 2.11.4.GIT