shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-22 13:45:07 +03:00
Code Activity

analyze-dot: minor modernization

Browse Source
This commit is contained in:
Mike Yuan
2024-03-23 00:34:53 +08:00
parent 3efb597b07
commit de91848c3a
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/analyze/analyze-dot.c
View File

@@ -13,14 +13,15 @@ static int graph_one_property(
const UnitInfo *u, const UnitInfo *u,
const char *prop, const char *prop,
const char *color, const char *color,
char *patterns[], char **patterns,
char *from_patterns[], char **from_patterns,
char *to_patterns[]) { char **to_patterns) {
_cleanup_strv_free_ char **units = NULL; _cleanup_strv_free_ char **units = NULL;
bool match_patterns; bool match_patterns;
int r; int r;
assert(bus);
assert(u); assert(u);
assert(prop); assert(prop);
assert(color); assert(color);
@@ -51,7 +52,13 @@ static int graph_one_property(
return 0; return 0;
} }
static int graph_one(sd_bus *bus, const UnitInfo *u, char *patterns[], char *from_patterns[], char *to_patterns[]) { static int graph_one(
sd_bus *bus,
const UnitInfo *u,
char **patterns,
char **from_patterns,
char **to_patterns) {
int r; int r;
assert(bus); assert(bus);
@@ -67,12 +74,15 @@ static int graph_one(sd_bus *bus, const UnitInfo *u, char *patterns[], char *fro
r = graph_one_property(bus, u, "Requires", "black", patterns, from_patterns, to_patterns); r = graph_one_property(bus, u, "Requires", "black", patterns, from_patterns, to_patterns);
if (r < 0) if (r < 0)
return r; return r;
r = graph_one_property(bus, u, "Requisite", "darkblue", patterns, from_patterns, to_patterns); r = graph_one_property(bus, u, "Requisite", "darkblue", patterns, from_patterns, to_patterns);
if (r < 0) if (r < 0)
return r; return r;
r = graph_one_property(bus, u, "Wants", "grey66", patterns, from_patterns, to_patterns); r = graph_one_property(bus, u, "Wants", "grey66", patterns, from_patterns, to_patterns);
if (r < 0) if (r < 0)
return r; return r;
r = graph_one_property(bus, u, "Conflicts", "red", patterns, from_patterns, to_patterns); r = graph_one_property(bus, u, "Conflicts", "red", patterns, from_patterns, to_patterns);
if (r < 0) if (r < 0)
return r; return r;
@@ -85,6 +95,9 @@ static int expand_patterns(sd_bus *bus, char **patterns, char ***ret) {
_cleanup_strv_free_ char **expanded_patterns = NULL; _cleanup_strv_free_ char **expanded_patterns = NULL;
int r; int r;
assert(bus);
assert(ret);
STRV_FOREACH(pattern, patterns) { STRV_FOREACH(pattern, patterns) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *unit = NULL, *unit_id = NULL; _cleanup_free_ char *unit = NULL, *unit_id = NULL;
@@ -110,10 +123,9 @@ static int expand_patterns(sd_bus *bus, char **patterns, char ***ret) {
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to get ID: %s", bus_error_message(&error, r)); return log_error_errno(r, "Failed to get ID: %s", bus_error_message(&error, r));
if (!streq(*pattern, unit_id)) { if (!streq(*pattern, unit_id))
if (strv_extend(&expanded_patterns, unit_id) < 0) if (strv_extend(&expanded_patterns, unit_id) < 0)
return log_oom(); return log_oom();
}
} }
*ret = TAKE_PTR(expanded_patterns); /* do not free */ *ret = TAKE_PTR(expanded_patterns); /* do not free */
@@ -128,8 +140,8 @@ int verb_dot(int argc, char *argv[], void *userdata) {
_cleanup_strv_free_ char **expanded_patterns = NULL; _cleanup_strv_free_ char **expanded_patterns = NULL;
_cleanup_strv_free_ char **expanded_from_patterns = NULL; _cleanup_strv_free_ char **expanded_from_patterns = NULL;
_cleanup_strv_free_ char **expanded_to_patterns = NULL; _cleanup_strv_free_ char **expanded_to_patterns = NULL;
int r;
UnitInfo u; UnitInfo u;
int r;
r = acquire_bus(&bus, NULL); r = acquire_bus(&bus, NULL);
if (r < 0) if (r < 0)