]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
string-util: optimize strshorten() a bit
authorLennart Poettering <lennart@poettering.net>
Thu, 20 Jul 2017 12:17:30 +0000 (14:17 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 31 Jul 2017 16:20:28 +0000 (18:20 +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 32878658636d7d528541582b1b266910124e117c..5808b1280eb83d6593ef20a8bf5f8ba7d2433078 100644 (file)
@@ -558,7 +558,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;