]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
analyze: replace isempty()+ternary with strempty() 1475/head
authorŁukasz Stelmach <l.stelmach@samsung.com>
Fri, 2 Oct 2015 07:45:49 +0000 (09:45 +0200)
committerŁukasz Stelmach <l.stelmach@samsung.com>
Tue, 6 Oct 2015 15:56:19 +0000 (17:56 +0200)
src/analyze/analyze.c

index ae376a9553888ec6e9f51c36f7d3fec3326f7b77..c2ebdc34436909269c8bbd10b7e744b085ffb162 100644 (file)
@@ -658,13 +658,13 @@ 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>",
-            isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,
-            isempty(host->hostname) ? "" : host->hostname,
-            isempty(host->kernel_name) ? "" : host->kernel_name,
-            isempty(host->kernel_release) ? "" : host->kernel_release,
-            isempty(host->kernel_version) ? "" : host->kernel_version,
-            isempty(host->architecture) ? "" : host->architecture,
-            isempty(host->virtualization) ? "" : host->virtualization);
+            strempty(host->os_pretty_name),
+            strempty(host->hostname),
+            strempty(host->kernel_name),
+            strempty(host->kernel_release),
+            strempty(host->kernel_version),
+            strempty(host->architecture),
+            strempty(host->virtualization));
 
         svg("<g transform=\"translate(%.3f,100)\">\n", 20.0 + (SCALE_X * boot->firmware_time));
         svg_graph_box(m, -(double) boot->firmware_time, boot->finish_time);