From dc9e19961a3ed2040f59bea11e42ee6b3b2b66ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Thu, 25 Jan 2018 20:11:11 +0000 Subject: [PATCH] Code cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrien Gallouët --- src/str.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/str.h b/src/str.h index 302933d..fb38837 100644 --- a/src/str.h +++ b/src/str.h @@ -39,24 +39,18 @@ str_cat(char *dst, const char **src, size_t count, size_t dst_len) return 0; size_t len = 0; - size_t p = 0; - for (size_t i = 0; i < count; i++) { + for (size_t i = 0; i < count && dst_len > len; i++) { size_t n = str_len(src[i], dst_len - len); - if (!n) - continue; - - if (dst && len + n <= dst_len) { + if (dst && n) memmove(&dst[len], src[i], n); - p = len + n; - } len += n; } if (dst) - dst[p] = 0; + dst[len] = 0; return len; }