X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcgtop%2Fcgtop.c;h=3c7ad40605a0e8ac83e2692b83eeed4c527089dc;hb=f6f8d466bd6ce5f737d66a076c1f9e40d8ec9d7f;hp=ab8c4cfda1cfcc6678bd9a5a0a3fc4210ec27226;hpb=d5099efc47d4e6ac60816b5381a5f607ab03f06e;p=elogind.git diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c index ab8c4cfda..3c7ad4060 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -126,7 +126,9 @@ static int process(const char *controller, const char *path, Hashmap *a, Hashmap return r; } } else { - assert_se(hashmap_move_one(a, b, path) == 0); + r = hashmap_move_one(a, b, path); + if (r < 0) + return r; g->cpu_valid = g->memory_valid = g->io_valid = g->n_tasks_valid = false; } } @@ -746,7 +748,7 @@ int main(int argc, char *argv[]) { if (r == -ETIMEDOUT) continue; if (r < 0) { - log_error("Couldn't read key: %s", strerror(-r)); + log_error_errno(r, "Couldn't read key: %m"); goto finish; } } @@ -840,7 +842,7 @@ finish: group_hashmap_free(b); if (r < 0) { - log_error("Exiting with failure: %s", strerror(-r)); + log_error_errno(r, "Exiting with failure: %m"); return EXIT_FAILURE; }