shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

coredump: fix typo and use hashmap_free_with_destructor

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-11-28 12:37:14 +01:00
parent e85b096b43
commit 39ab16e397
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/coredump/coredump-vacuum.c
View File

@ -52,16 +52,11 @@ static void vacuum_candidate_free(struct vacuum_candidate *c) {
DEFINE_TRIVIAL_CLEANUP_FUNC(struct vacuum_candidate*, vacuum_candidate_free); DEFINE_TRIVIAL_CLEANUP_FUNC(struct vacuum_candidate*, vacuum_candidate_free);
static void vacuum_candidate_hasmap_free(Hashmap *h) { static void vacuum_candidate_hashmap_free(Hashmap *h) {
struct vacuum_candidate *c; hashmap_free_with_destructor(h, vacuum_candidate_free);
while ((c = hashmap_steal_first(h)))
vacuum_candidate_free(c);
hashmap_free(h);
} }
DEFINE_TRIVIAL_CLEANUP_FUNC(Hashmap*, vacuum_candidate_hasmap_free); DEFINE_TRIVIAL_CLEANUP_FUNC(Hashmap*, vacuum_candidate_hashmap_free);
static int uid_from_file_name(const char *filename, uid_t *uid) { static int uid_from_file_name(const char *filename, uid_t *uid) {
const char *p, *e, *u; const char *p, *e, *u;
@ -160,7 +155,7 @@ int coredump_vacuum(int exclude_fd, uint64_t keep_free, uint64_t max_use) {
} }
for (;;) { for (;;) {
_cleanup_(vacuum_candidate_hasmap_freep) Hashmap *h = NULL; _cleanup_(vacuum_candidate_hashmap_freep) Hashmap *h = NULL;
struct vacuum_candidate *worst = NULL; struct vacuum_candidate *worst = NULL;
struct dirent *de; struct dirent *de;
uint64_t sum = 0; uint64_t sum = 0;