From f8294e4175918117ca6c131720bcf287eadcd029 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sat, 15 Mar 2014 11:40:07 -0700 Subject: Use strlen even for constant strings GCC optimizes strlen("string constant") to a constant, even with -O0. Thus, replace patterns like sizeof("string constant")-1 with strlen("string constant") where possible, for clarity. In particular, for expressions intended to add up the lengths of components going into a string, this often makes it clearer that the expression counts the trailing '\0' exactly once, by putting the +1 for the '\0' at the end of the expression, rather than hidden in a sizeof in the middle of the expression. --- src/shared/unit-name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/shared/unit-name.c') diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c index e9b0636143..6c167b4331 100644 --- a/src/shared/unit-name.c +++ b/src/shared/unit-name.c @@ -493,7 +493,7 @@ char *unit_name_mangle(const char *name, enum unit_name_mangle allow_globs) { /* We'll only escape the obvious characters here, to play * safe. */ - r = new(char, strlen(name) * 4 + 1 + sizeof(".service")-1); + r = new(char, strlen(name) * 4 + strlen(".service") + 1); if (!r) return NULL; -- cgit v1.2.3-54-g00ecf