From f39f1b81b67bbe5137bdc87e76076407bd77f0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 2 Jun 2018 17:52:07 +0200 Subject: basic/string-util: make ellipsize() inline Once the redundant check is removed, it's a very simple wrapper around ellipsize_mem(). --- src/basic/string-util.c | 7 ------- src/basic/string-util.h | 5 ++++- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/basic/string-util.c b/src/basic/string-util.c index cb6428e8a..bdaa42084 100644 --- a/src/basic/string-util.c +++ b/src/basic/string-util.c @@ -611,13 +611,6 @@ char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigne return e; } -char *ellipsize(const char *s, size_t length, unsigned percent) { - if (length == (size_t) -1) - return strdup(s); - - return ellipsize_mem(s, strlen(s), length, percent); -} - char *cellescape(char *buf, size_t len, const char *s) { /* Escape and ellipsize s into buffer buf of size len. Only non-control ASCII * characters are copied as they are, everything else is escaped. The result diff --git a/src/basic/string-util.h b/src/basic/string-util.h index 7ee9aef70..1671697a0 100644 --- a/src/basic/string-util.h +++ b/src/basic/string-util.h @@ -164,7 +164,10 @@ static inline bool _pure_ in_charset(const char *s, const char* charset) { bool string_has_cc(const char *p, const char *ok) _pure_; char *ellipsize_mem(const char *s, size_t old_length_bytes, size_t new_length_columns, unsigned percent); -char *ellipsize(const char *s, size_t length, unsigned percent); +static inline char *ellipsize(const char *s, size_t length, unsigned percent) { + return ellipsize_mem(s, strlen(s), length, percent); +} + char *cellescape(char *buf, size_t len, const char *s); /* This limit is arbitrary, enough to give some idea what the string contains */ -- cgit v1.2.3