static int found_override(const char *top, const char *bottom) {
_cleanup_free_ char *dest = NULL;
- int k;
+ int k, r;
pid_t pid;
assert(top);
_exit(1);
}
- wait_for_terminate(pid, NULL);
+ r = wait_for_terminate(pid, NULL);
+ if (r < 0)
+ log_warning("Failed to wait for diff: %s", strerror(-r));
putchar('\n');
h = hashmap_get(drops, unit);
if (!h) {
- h = hashmap_new(string_hash_func, string_compare_func);
+ h = hashmap_new(&string_hash_ops);
if (!h)
return -ENOMEM;
hashmap_put(drops, unit, h);
dropins = nulstr_contains(have_dropins, suffix);
- top = hashmap_new(string_hash_func, string_compare_func);
- bottom = hashmap_new(string_hash_func, string_compare_func);
- drops = hashmap_new(string_hash_func, string_compare_func);
+ top = hashmap_new(&string_hash_ops);
+ bottom = hashmap_new(&string_hash_ops);
+ drops = hashmap_new(&string_hash_ops);
if (!top || !bottom || !drops) {
r = -ENOMEM;
goto finish;