diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-03-15 11:40:07 -0700 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-16 09:52:56 -0400 |
| commit | f8294e4175918117ca6c131720bcf287eadcd029 (patch) | |
| tree | c5b2f4d3088fbd4fd75989b3f7eed128681951e1 /src/shared | |
| parent | 039dd4afd64a8c8413ff28d43f533c30c5a06a16 (diff) | |
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.
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/cgroup-util.c | 2 | ||||
| -rw-r--r-- | src/shared/unit-name.c | 2 | ||||
| -rw-r--r-- | src/shared/util.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index 06eb453d1a..9d50890adc 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -509,7 +509,7 @@ static int check_hierarchy(const char *p) { assert(p); /* Check if this controller actually really exists */ - cc = alloca(sizeof("/sys/fs/cgroup/") + strlen(p)); + cc = alloca(strlen("/sys/fs/cgroup/") + strlen(p) + 1); strcpy(stpcpy(cc, "/sys/fs/cgroup/"), p); if (access(cc, F_OK) < 0) return -errno; 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; diff --git a/src/shared/util.c b/src/shared/util.c index 7e17851fcd..75870fcbe2 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -4185,7 +4185,7 @@ int socket_from_display(const char *display, char **path) { k = strspn(display+1, "0123456789"); - f = new(char, sizeof("/tmp/.X11-unix/X") + k); + f = new(char, strlen("/tmp/.X11-unix/X") + k + 1); if (!f) return -ENOMEM; |