summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-10-07 11:36:29 +0200
committerDaniel Mack <github@zonque.org>2015-10-07 11:36:29 +0200
commit064d3eb5a5f109dfcaa5d4bf31dae30030dad41b (patch)
tree6c454c571290897d343e0c5efc8399f74d6eb51b
parentdc086b54305882a07aeda4cb6efcc85640f55dc1 (diff)
parentfebda62a36bea0a817b8bc6e63d71e74f65845ba (diff)
Merge pull request #1478 from steelman/analyze-without-hostnamed-fix
analyze: minor fixes according to review
-rw-r--r--src/analyze/analyze.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index c2ebdc3443..a76990360a 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -435,7 +435,7 @@ fail:
static int acquire_host_info(sd_bus *bus, struct host_info **hi) {
int r;
- struct host_info *host;
+ _cleanup_host_info_ struct host_info *host;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
static const struct bus_properties_map hostname_map[] = {
@@ -471,13 +471,12 @@ static int acquire_host_info(sd_bus *bus, struct host_info **hi) {
"/org/freedesktop/systemd1",
manager_map,
host);
- if (r < 0) {
- free_host_info(host);
+ if (r < 0)
return log_error_errno(r, "Failed to get host information from systemd: %s",
bus_error_message(&error, r));
- }
*hi = host;
+ host = NULL;
return 0;
}
@@ -658,7 +657,7 @@ static int analyze_plot(sd_bus *bus) {
svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n");
svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
- strempty(host->os_pretty_name),
+ isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,
strempty(host->hostname),
strempty(host->kernel_name),
strempty(host->kernel_release),