summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-04-08 19:42:48 +0200
committerLennart Poettering <lennart@poettering.net>2013-04-08 20:35:25 +0200
commit816f25e86ab690da6e408bc8d5b03dae9cc1b219 (patch)
tree875a42e9432b62501fcac1d6fa44165d50324d66 /src
parent903a0b07e003c1ad976dc30e98b69a70778007ad (diff)
analyze: various cleanups
Diffstat (limited to 'src')
-rw-r--r--src/analyze/systemd-analyze.c52
1 files changed, 30 insertions, 22 deletions
diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c
index ec579282e7..e648a4449f 100644
--- a/src/analyze/systemd-analyze.c
+++ b/src/analyze/systemd-analyze.c
@@ -626,40 +626,48 @@ static int graph_one_property(const char *name, const char *prop, DBusMessageIte
dbus_message_iter_next(&sub)) {
const char *s;
char **p;
- bool match_found = true;
+ bool match_found;
assert(dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING);
dbus_message_iter_get_basic(&sub, &s);
- STRV_FOREACH(p, arg_dot_from_patterns) {
+ if (!strv_isempty(arg_dot_from_patterns)) {
match_found = false;
- if (fnmatch(*p, name, 0) == 0) {
- match_found = true;
- break;
- }
+
+ STRV_FOREACH(p, arg_dot_from_patterns)
+ if (fnmatch(*p, name, 0) == 0) {
+ match_found = true;
+ break;
+ }
+
+ if (!match_found)
+ continue;
}
- if (!match_found)
- continue;
- STRV_FOREACH(p, arg_dot_to_patterns) {
+ if (!strv_isempty(arg_dot_to_patterns)) {
match_found = false;
- if (fnmatch(*p, s, 0) == 0) {
- match_found = true;
- break;
- }
+
+ STRV_FOREACH(p, arg_dot_to_patterns)
+ if (fnmatch(*p, s, 0) == 0) {
+ match_found = true;
+ break;
+ }
+
+ if (!match_found)
+ continue;
}
- if (!match_found)
- continue;
- STRV_FOREACH(p, patterns) {
+ if (!strv_isempty(patterns)) {
match_found = false;
- if (fnmatch(*p, name, 0) == 0 || fnmatch(*p, s, 0) == 0) {
- match_found = true;
- break;
- }
+
+ STRV_FOREACH(p, patterns)
+ if (fnmatch(*p, name, 0) == 0 || fnmatch(*p, s, 0) == 0) {
+ match_found = true;
+ break;
+ }
+ if (!match_found)
+ continue;
}
- if (!match_found)
- continue;
printf("\t\"%s\"->\"%s\" %s;\n", name, s, c);
}