From 9a8d1b455b80385342ebed20be839f5ca5c8f15b Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Wed, 20 Jan 2021 12:51:08 +0100 Subject: [PATCH] logind: Use hashmap_ensure_put --- src/login/logind-brightness.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c index a6a16033965..f4306749ec0 100644 --- a/src/login/logind-brightness.c +++ b/src/login/logind-brightness.c @@ -217,10 +217,6 @@ int manager_write_brightness( return 0; } - r = hashmap_ensure_allocated(&m->brightness_writers, &brightness_writer_hash_ops); - if (r < 0) - return log_oom(); - w = new(BrightnessWriter, 1); if (!w) return log_oom(); @@ -234,9 +230,12 @@ int manager_write_brightness( if (!w->path) return log_oom(); - r = hashmap_put(m->brightness_writers, w->path, w); + r = hashmap_ensure_put(&m->brightness_writers, &brightness_writer_hash_ops, w->path, w); + if (r == -ENOMEM) + return log_oom(); if (r < 0) return log_error_errno(r, "Failed to add brightness writer to hashmap: %m"); + w->manager = m; r = set_add_message(&w->current_messages, message); -- 2.47.3