From 586290017d09a1081bfcd328098022a933d40888 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 15 Dec 2017 16:36:35 +0900 Subject: [PATCH] tree-wide: use !strv_isempty() instead of strv_length() > 0 --- src/core/execute.c | 6 +++--- src/notify/notify.c | 2 +- src/shared/ask-password-api.c | 2 +- src/shared/bus-unit-util.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/execute.c b/src/core/execute.c index b91f654994a..aa9120b2eda 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -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); diff --git a/src/notify/notify.c b/src/notify/notify.c index 3e511b7e478..4a34e1e9dbc 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -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; } diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 17928a9732c..346d8c9d24e 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -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; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 8af738d8ce8..372e431d63f 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -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) -- 2.47.3