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/journal | |
| 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/journal')
| -rw-r--r-- | src/journal/journald-server.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-syslog.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index f0117e742e..5befe93fd4 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -686,7 +686,7 @@ static void dispatch_message_real( #ifdef HAVE_SELINUX if (use_selinux()) { if (label) { - x = alloca(sizeof("_SELINUX_CONTEXT=") + label_len); + x = alloca(strlen("_SELINUX_CONTEXT=") + label_len + 1); *((char*) mempcpy(stpcpy(x, "_SELINUX_CONTEXT="), label, label_len)) = 0; IOVEC_SET_STRING(iovec[n++], x); diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index cbb944f287..fee7d91572 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -46,7 +46,7 @@ static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned .msg_iovlen = n_iovec, .msg_name = &sa, .msg_namelen = offsetof(union sockaddr_union, un.sun_path) - + sizeof("/run/systemd/journal/syslog") - 1, + + strlen("/run/systemd/journal/syslog"), }; struct cmsghdr *cmsg; union { |