X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fanalyze%2Fanalyze.c;h=6a6855148ee3183b9ee14491d3eed24939c4b4ba;hb=b6b1849830f5e4a6065c3b0c993668e500c954d3;hp=1281d6b9ea835dfaae5ccf1a6a40bc6a059687f5;hpb=d725a138c5c311ba06567d6841933aa5b7b6a435;p=elogind.git diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 1281d6b9e..6a6855148 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -848,7 +848,8 @@ static int list_dependencies(sd_bus *bus, const char *name) { char ts[FORMAT_TIMESPAN_MAX]; struct unit_times *times; int r; - const char *path, *id; + const char *id; + _cleanup_free_ char *path = NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; struct boot_times *boot; @@ -906,7 +907,7 @@ static int analyze_critical_chain(sd_bus *bus, char *names[]) { if (n <= 0) return n; - h = hashmap_new(string_hash_func, string_compare_func); + h = hashmap_new(&string_hash_ops); if (!h) return -ENOMEM; @@ -1312,7 +1313,7 @@ static int parse_argv(int argc, char *argv[]) { break; case 'M': - arg_transport = BUS_TRANSPORT_CONTAINER; + arg_transport = BUS_TRANSPORT_MACHINE; arg_host = optarg; break; @@ -1361,7 +1362,7 @@ int main(int argc, char *argv[]) { r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus); if (r < 0) { - log_error("Failed to create bus connection: %s", strerror(-r)); + log_error_errno(r, "Failed to create bus connection: %m"); goto finish; }