if (!f)
return errno == ENOENT ? 0 : -errno;
- r = hashmap_ensure_allocated(&database_user, string_hash_func, string_compare_func);
+ r = hashmap_ensure_allocated(&database_user, &string_hash_ops);
if (r < 0)
return r;
- r = hashmap_ensure_allocated(&database_uid, trivial_hash_func, trivial_compare_func);
+ r = hashmap_ensure_allocated(&database_uid, NULL);
if (r < 0)
return r;
if (!f)
return errno == ENOENT ? 0 : -errno;
- r = hashmap_ensure_allocated(&database_group, string_hash_func, string_compare_func);
+ r = hashmap_ensure_allocated(&database_group, &string_hash_ops);
if (r < 0)
return r;
- r = hashmap_ensure_allocated(&database_gid, trivial_hash_func, trivial_compare_func);
+ r = hashmap_ensure_allocated(&database_gid, NULL);
if (r < 0)
return r;
static int read_id_from_file(Item *i, uid_t *_uid, gid_t *_gid) {
struct stat st;
bool found_uid = false, found_gid = false;
- uid_t uid;
- gid_t gid;
+ uid_t uid = 0;
+ gid_t gid = 0;
assert(i);
i->uid = search_uid;
}
- r = hashmap_ensure_allocated(&todo_uids, trivial_hash_func, trivial_compare_func);
+ r = hashmap_ensure_allocated(&todo_uids, NULL);
if (r < 0)
return log_oom();
i->gid = search_uid;
}
- r = hashmap_ensure_allocated(&todo_gids, trivial_hash_func, trivial_compare_func);
+ r = hashmap_ensure_allocated(&todo_gids, NULL);
if (r < 0)
return log_oom();
if (!i) {
_cleanup_(item_freep) Item *j = NULL;
- r = hashmap_ensure_allocated(&groups, string_hash_func, string_compare_func);
+ r = hashmap_ensure_allocated(&groups, &string_hash_ops);
if (r < 0)
return log_oom();
if (!i) {
_cleanup_(item_freep) Item *j = NULL;
- r = hashmap_ensure_allocated(&users, string_hash_func, string_compare_func);
+ r = hashmap_ensure_allocated(&users, &string_hash_ops);
if (r < 0)
return log_oom();
return -EINVAL;
}
- r = hashmap_ensure_allocated(&members, string_hash_func, string_compare_func);
+ r = hashmap_ensure_allocated(&members, &string_hash_ops);
if (r < 0)
return log_oom();
return -EINVAL;
}
- r = hashmap_ensure_allocated(&users, string_hash_func, string_compare_func);
+ r = hashmap_ensure_allocated(&users, &string_hash_ops);
if (r < 0)
return log_oom();
return -EINVAL;
}
- r = hashmap_ensure_allocated(&groups, string_hash_func, string_compare_func);
+ r = hashmap_ensure_allocated(&groups, &string_hash_ops);
if (r < 0)
return log_oom();
FILE *f = NULL;
char line[LINE_MAX];
unsigned v = 0;
- int r;
+ int r = 0;
assert(fn);