]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: use !strv_isempty() instead of strv_length() > 0
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 15 Dec 2017 07:36:35 +0000 (16:36 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 19 Dec 2017 01:43:57 +0000 (10:43 +0900)
src/core/execute.c
src/notify/notify.c
src/shared/ask-password-api.c
src/shared/bus-unit-util.c

index b91f654994a615180faaab58b338e7600aa46796..aa9120b2eda8eaf6651c599a1d5b3430cafa9cee 100644 (file)
@@ -4162,19 +4162,19 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
         if (c->pam_name)
                 fprintf(f, "%sPAMName: %s\n", prefix, c->pam_name);
 
-        if (strv_length(c->read_write_paths) > 0) {
+        if (!strv_isempty(c->read_write_paths)) {
                 fprintf(f, "%sReadWritePaths:", prefix);
                 strv_fprintf(f, c->read_write_paths);
                 fputs("\n", f);
         }
 
-        if (strv_length(c->read_only_paths) > 0) {
+        if (!strv_isempty(c->read_only_paths)) {
                 fprintf(f, "%sReadOnlyPaths:", prefix);
                 strv_fprintf(f, c->read_only_paths);
                 fputs("\n", f);
         }
 
-        if (strv_length(c->inaccessible_paths) > 0) {
+        if (!strv_isempty(c->inaccessible_paths)) {
                 fprintf(f, "%sInaccessiblePaths:", prefix);
                 strv_fprintf(f, c->inaccessible_paths);
                 fputs("\n", f);
index 3e511b7e47815ce663ce1aa683eaa8d2054d30da..4a34e1e9dbce554128a6f3b0145c1418cc69945b 100644 (file)
@@ -179,7 +179,7 @@ int main(int argc, char* argv[]) {
                 goto finish;
         }
 
-        if (strv_length(final_env) <= 0) {
+        if (strv_isempty(final_env)) {
                 r = 0;
                 goto finish;
         }
index 17928a9732c19ae3d8ffce14daa56abeb08a4592..346d8c9d24e82f1e4de0a1295dd7bf31fdb3cc40 100644 (file)
@@ -656,7 +656,7 @@ int ask_password_agent(
                                 goto finish;
                         }
 
-                        if (strv_length(l) <= 0) {
+                        if (strv_isempty(l)) {
                                 l = strv_free(l);
                                 log_debug("Invalid packet");
                                 continue;
index 8af738d8ce8cebe9ad1c78de372a046270268d29..372e431d63f193d2079088bf0baffdb49a80482d 100644 (file)
@@ -1269,7 +1269,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                 if (r < 0)
                         return r;
 
-                if (strv_length(l) > 0) {
+                if (!strv_isempty(l)) {
 
                         r = sd_bus_message_open_container(m, 'r', "sasb");
                         if (r < 0)