exec-util: modernize exec_command_flags_{to,from}_strv

- Rename ret params following our coding style
- Use assertion where appropriate
- Use BIT_FOREACH()

1 files changed, 23 insertions, 26 deletions

diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index 996edbf997..5408be5328 100644
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 
 #include "alloc-util.h"
+#include "bitfield.h"
 #include "conf-files.h"
 #include "env-file.h"
 #include "env-util.h"
@@ -425,46 +426,42 @@ static int gather_environment_consume(int fd, void *arg) {
         return r;
 }
 
-int exec_command_flags_from_strv(char **ex_opts, ExecCommandFlags *flags) {
-        ExecCommandFlags ex_flag, ret_flags = 0;
+int exec_command_flags_from_strv(char * const *ex_opts, ExecCommandFlags *ret) {
+        ExecCommandFlags flags = 0;
 
-        assert(flags);
+        assert(ret);
 
         STRV_FOREACH(opt, ex_opts) {
-                ex_flag = exec_command_flags_from_string(*opt);
-                if (ex_flag < 0)
-                        return ex_flag;
-                ret_flags |= ex_flag;
+                ExecCommandFlags fl = exec_command_flags_from_string(*opt);
+                if (fl < 0)
+                        return fl;
+
+                flags |= fl;
         }
 
-        *flags = ret_flags;
+        *ret = flags;
 
         return 0;
 }
 
-int exec_command_flags_to_strv(ExecCommandFlags flags, char ***ex_opts) {
-        _cleanup_strv_free_ char **ret_opts = NULL;
-        ExecCommandFlags it = flags;
-        const char *str;
+int exec_command_flags_to_strv(ExecCommandFlags flags, char ***ret) {
+        _cleanup_strv_free_ char **opts = NULL;
         int r;
 
-        assert(ex_opts);
-
-        if (flags < 0)
-                return flags;
+        assert(flags >= 0);
+        assert(ret);
 
-        for (unsigned i = 0; it != 0; it &= ~(1 << i), i++)
-                if (FLAGS_SET(flags, (1 << i))) {
-                        str = exec_command_flags_to_string(1 << i);
-                        if (!str)
-                                return -EINVAL;
+        BIT_FOREACH(i, flags) {
+                const char *s = exec_command_flags_to_string(1 << i);
+                if (!s)
+                        return -EINVAL;
 
-                        r = strv_extend(&ret_opts, str);
-                        if (r < 0)
-                                return r;
-                }
+                r = strv_extend(&opts, s);
+                if (r < 0)
+                        return r;
+        }
 
-        *ex_opts = TAKE_PTR(ret_opts);
+        *ret = TAKE_PTR(opts);
 
         return 0;
 }