From cf55fe4a4c23a3f899aaf5d124dd1eafea16e0e0 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 09:49:14 +0100 Subject: [PATCH 01/12] core: dbus - use hashmap_ensure_put --- src/core/dbus-execute.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 4ad9181993..20403df819 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -1983,11 +1983,7 @@ int bus_exec_context_set_transient_property( sc->data = TAKE_PTR(copy); sc->size = sz; - r = hashmap_ensure_allocated(&c->set_credentials, &exec_set_credential_hash_ops); - if (r < 0) - return r; - - r = hashmap_put(c->set_credentials, sc->id, sc); + r = hashmap_ensure_put(&c->set_credentials, &exec_set_credential_hash_ops, sc->id, sc); if (r < 0) return r; From 53dba3ef07c1138d70f58961a9b70089e25ae5c9 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 14:24:36 +0100 Subject: [PATCH 02/12] core: job - use hashmap_ensure_put --- src/core/job.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/core/job.c b/src/core/job.c index f3c1a02831..e857f15b4b 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -263,11 +263,7 @@ int job_install_deserialized(Job *j) { return log_unit_debug_errno(j->unit, SYNTHETIC_ERRNO(EEXIST), "Unit already has a job installed. Not installing deserialized job."); - r = hashmap_ensure_allocated(&j->manager->jobs, NULL); - if (r < 0) - return r; - - r = hashmap_put(j->manager->jobs, UINT32_TO_PTR(j->id), j); + r = hashmap_ensure_put(&j->manager->jobs, NULL, UINT32_TO_PTR(j->id), j); if (r == -EEXIST) return log_unit_debug_errno(j->unit, r, "Job ID %" PRIu32 " already used, cannot deserialize job.", j->id); if (r < 0) From f85f5f0dc86e611439740b807e9a3a7f7121ff88 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 09:55:00 +0100 Subject: [PATCH 03/12] core: load fragment - use hashmap_ensure_put --- src/core/load-fragment.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 4401e598b5..494c7f55a7 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -4536,14 +4536,12 @@ int config_parse_set_credential( sc->data = TAKE_PTR(unescaped); sc->size = l; - r = hashmap_ensure_allocated(&context->set_credentials, &exec_set_credential_hash_ops); + r = hashmap_ensure_put(&context->set_credentials, &exec_set_credential_hash_ops, sc->id, sc); + if (r == -ENOMEM) + return log_oom(); if (r < 0) return r; - r = hashmap_put(context->set_credentials, sc->id, sc); - if (r < 0) - return log_oom(); - TAKE_PTR(sc); } From 4bc2516856bce713a07d0f5f8eaae11033a383af Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:02:17 +0100 Subject: [PATCH 04/12] journal-remote: use hashmap_ensure_put --- src/journal-remote/journal-remote-main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index af8cde7eef..b00151c32e 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -483,13 +483,11 @@ static int setup_microhttpd_server(RemoteServer *s, goto error; } - r = hashmap_ensure_allocated(&s->daemons, &uint64_hash_ops); - if (r < 0) { + r = hashmap_ensure_put(&s->daemons, &uint64_hash_ops, &d->fd, d); + if (r == -ENOMEM) { log_oom(); goto error; } - - r = hashmap_put(s->daemons, &d->fd, d); if (r < 0) { log_error_errno(r, "Failed to add daemon to hashmap: %m"); goto error; From 71fb97c7c4c29374713cec7dec934672b7f91b32 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:14:25 +0100 Subject: [PATCH 05/12] resolved-bus: Use hashmap_ensure_put --- src/resolve/resolved-bus.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 9a4789543a..dd27c50b49 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -1943,11 +1943,7 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata, if (r == 0) return 1; /* Polkit will call us back */ - r = hashmap_ensure_allocated(&m->dnssd_services, &string_hash_ops); - if (r < 0) - return r; - - r = hashmap_put(m->dnssd_services, service->name, service); + r = hashmap_ensure_put(&m->dnssd_services, &string_hash_ops, service->name, service); if (r < 0) return r; From 3004fcd0b8031a8b2d1bdaa60da906ef6b4e61de Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:19:21 +0100 Subject: [PATCH 06/12] resolved-dns-packet: Use hashmap_ensure_put --- src/resolve/resolved-dns-packet.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index ede499f486..704ac56a7c 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -557,11 +557,7 @@ int dns_packet_append_name( goto fail; } - r = hashmap_ensure_allocated(&p->names, &dns_name_hash_ops); - if (r < 0) - goto fail; - - r = hashmap_put(p->names, s, SIZE_TO_PTR(n)); + r = hashmap_ensure_put(&p->names, &dns_name_hash_ops, s, SIZE_TO_PTR(n)); if (r < 0) goto fail; From daced7483b54d9166080343efa52c2f38997c83c Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:20:22 +0100 Subject: [PATCH 07/12] resolved-dns-packet: Use TAKE_PTR --- src/resolve/resolved-dns-packet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index 704ac56a7c..9a0e2d5161 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -561,7 +561,7 @@ int dns_packet_append_name( if (r < 0) goto fail; - s = NULL; + TAKE_PTR(s); } } From 276abbeebc43a784b9a19983e66f694f79e5b3ad Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:23:04 +0100 Subject: [PATCH 08/12] resolved-dnssd: Use hashmap_ensure_put --- src/resolve/resolved-dnssd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c index 8b40639728..159960ed8b 100644 --- a/src/resolve/resolved-dnssd.c +++ b/src/resolve/resolved-dnssd.c @@ -120,11 +120,7 @@ static int dnssd_service_load(Manager *manager, const char *filename) { txt_data = NULL; } - r = hashmap_ensure_allocated(&manager->dnssd_services, &string_hash_ops); - if (r < 0) - return r; - - r = hashmap_put(manager->dnssd_services, service->name, service); + r = hashmap_ensure_put(&manager->dnssd_services, &string_hash_ops, service->name, service); if (r < 0) return r; From 15c69d07002b6f10dce3ce987954d63eee0a69e0 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:24:29 +0100 Subject: [PATCH 09/12] resolved-dnssd: Use TAKE_PTR --- src/resolve/resolved-dnssd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c index 159960ed8b..34c96e18bd 100644 --- a/src/resolve/resolved-dnssd.c +++ b/src/resolve/resolved-dnssd.c @@ -117,7 +117,7 @@ static int dnssd_service_load(Manager *manager, const char *filename) { return r; LIST_PREPEND(items, service->txt_data_items, txt_data); - txt_data = NULL; + TAKE_PTR(txt_data); } r = hashmap_ensure_put(&manager->dnssd_services, &string_hash_ops, service->name, service); @@ -130,7 +130,7 @@ static int dnssd_service_load(Manager *manager, const char *filename) { if (r < 0) return r; - service = NULL; + TAKE_PTR(service); return 0; } From a3b42af5b65dc4a3709fa1e77968dcb578497ffa Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:28:15 +0100 Subject: [PATCH 10/12] udev-rules: Use hashmap_ensure_put --- src/udev/udev-rules.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 06a97d8671..c5c2f8cfea 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -336,11 +336,7 @@ static int rule_resolve_user(UdevRules *rules, const char *name, uid_t *ret) { if (!n) return -ENOMEM; - r = hashmap_ensure_allocated(&rules->known_users, &string_hash_ops); - if (r < 0) - return r; - - r = hashmap_put(rules->known_users, n, UID_TO_PTR(uid)); + r = hashmap_ensure_put(&rules->known_users, &string_hash_ops, n, UID_TO_PTR(uid)); if (r < 0) return r; @@ -375,11 +371,7 @@ static int rule_resolve_group(UdevRules *rules, const char *name, gid_t *ret) { if (!n) return -ENOMEM; - r = hashmap_ensure_allocated(&rules->known_groups, &string_hash_ops); - if (r < 0) - return r; - - r = hashmap_put(rules->known_groups, n, GID_TO_PTR(gid)); + r = hashmap_ensure_put(&rules->known_groups, &string_hash_ops, n, GID_TO_PTR(gid)); if (r < 0) return r; From 39f930c215f61df41d2f1da5eda98d2509ebff28 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:30:06 +0100 Subject: [PATCH 11/12] udevadm-monitor: Use hashmap_ensure_put --- src/udev/udevadm-monitor.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c index cae7f1bbb8..740344606d 100644 --- a/src/udev/udevadm-monitor.c +++ b/src/udev/udevadm-monitor.c @@ -157,11 +157,7 @@ static int parse_argv(int argc, char *argv[]) { if (!subsystem) return -ENOMEM; - r = hashmap_ensure_allocated(&arg_subsystem_filter, NULL); - if (r < 0) - return r; - - r = hashmap_put(arg_subsystem_filter, subsystem, devtype); + r = hashmap_ensure_put(&arg_subsystem_filter, NULL, subsystem, devtype); if (r < 0) return r; From a4aba097adb97b278daed4b8337270b819f91789 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Sun, 17 Jan 2021 10:31:30 +0100 Subject: [PATCH 12/12] udevadm-monitor: use TAKE_PTR --- src/udev/udevadm-monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c index 740344606d..64b1160d71 100644 --- a/src/udev/udevadm-monitor.c +++ b/src/udev/udevadm-monitor.c @@ -161,7 +161,8 @@ static int parse_argv(int argc, char *argv[]) { if (r < 0) return r; - subsystem = devtype = NULL; + TAKE_PTR(subsystem); + TAKE_PTR(devtype); break; } case 't':