_exit(1);
}
- wait_for_terminate(pid, NULL);
-
+ wait_for_terminate_and_warn("diff", pid);
putchar('\n');
return k;
r = get_files_in_directory(path, &list);
if (r < 0){
- log_error("Failed to enumerate %s: %s", path, strerror(-r));
+ log_error_errno(r, "Failed to enumerate %s: %m", path);
return r;
}
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;