tree-wide: a bunch of Coccinelle-suggested tweaks

rc2 edition

diff --git a/src/analyze/analyze-pcrs.c b/src/analyze/analyze-pcrs.c
index df678ab935f8f7fbdb3e384320a431ddec573498..82f0f3928807c97b97d9916721ed63033df8c1ce 100644 (file)
--- a/src/analyze/analyze-pcrs.c
+++ b/src/analyze/analyze-pcrs.c
@@ -18,7 +18,7 @@ static int get_pcr_alg(const char **ret) {
                         return log_oom();
 
                 if (access(p, F_OK) < 0) {
-                        if (errno != -ENOENT)
+                        if (errno != ENOENT)
                                 return log_error_errno(errno, "Failed to determine whether %s exists: %m", p);
                 } else {
                         *ret = alg;

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 5be8be3d26ac36e32edf5468290819876159a7ad..d3b6db9c55decb77943a89f1b0654eb2b9d5b5b3 100644 (file)
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -535,8 +535,7 @@ char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigne
                 for (const char *p = s + len; p < j; ) {
                         size_t slen = ansi_sequence_length(p, j - p);
                         if (slen > 0) {
-                                memcpy(dst, p, slen);
-                                dst += slen;
+                                dst = mempcpy(dst, p, slen);
                                 p += slen;
                         } else
                                 p = utf8_next_char(p);

diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c
index 40d6bc9514f7b303ef0ab8119b2fd772f45ace4c..573900f870427e095f71be2512b9f8f937bbb213 100644 (file)
--- a/src/shared/creds-util.c
+++ b/src/shared/creds-util.c
@@ -70,7 +70,7 @@ bool credential_glob_valid(const char *s) {
                 return false;
 
         /* Make a copy of the string without the '*' suffix */
-        a = strndupa(s, n);
+        a = strndupa_safe(s, n);
 
         return credential_name_valid(a);
 }

diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index 2e19d125c3981e416fe2a57c92737b72ca52e46a..644bed0dcc742ca321aa05169af25c63b60ece99 100644 (file)
--- a/src/socket-activate/socket-activate.c
+++ b/src/socket-activate/socket-activate.c
@@ -458,7 +458,7 @@ static int run(int argc, char **argv) {
         if (!exec_argv)
                 return log_oom();
 
-        assert(strv_length(exec_argv) > 0);
+        assert(!strv_isempty(exec_argv));
 
         r = install_chld_handler();
         if (r < 0)