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;
}
}
if (r <= 0)
goto finish;
- a = hashmap_new(string_hash_func, string_compare_func);
- b = hashmap_new(string_hash_func, string_compare_func);
+ a = hashmap_new(&string_hash_ops);
+ b = hashmap_new(&string_hash_ops);
if (!a || !b) {
r = log_oom();
goto finish;
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;
}
}
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;
}