chiark / gitweb /
string-util: optimize strshorten() a bit
authorLennart Poettering <lennart@poettering.net>
Thu, 20 Jul 2017 12:17:30 +0000 (14:17 +0200)
committerSven Eden <yamakuzure@gmx.net>
Thu, 20 Jul 2017 12:17:30 +0000 (14:17 +0200)
There's no reason to determine the full length of the string, it's
sufficient to know whether it is larger than the intended size...

src/basic/string-util.c

index 4bfce5a5dca163c3572e0a99d41b678480afa7fb..5172ac7756a3c32e1f8c39f632205132343fd36b 100644 (file)
@@ -562,7 +562,7 @@ bool nulstr_contains(const char *nulstr, const char *needle) {
 char* strshorten(char *s, size_t l) {
         assert(s);
 
-        if (l < strlen(s))
+        if (strnlen(s, l+1) > l)
                 s[l] = 0;
 
         return s;