From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Tue, 23 May 2023 17:21:20 +0000 (+0200)
Subject: sd-journal: use TAKE_PTR() a bit more
X-Git-Tag: v254-rc1~387^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32e44e4677d7f4e7ae83942b5d4c02fb349349d;p=thirdparty%2Fsystemd.git

sd-journal: use TAKE_PTR() a bit more
---

diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c
index 78f7f226c89..7f1dc0b4ed7 100644
--- a/src/libsystemd/sd-journal/catalog.c
+++ b/src/libsystemd/sd-journal/catalog.c
@@ -171,7 +171,8 @@ static int finish_item(
 
                 if (ordered_hashmap_update(h, i, combined) < 0)
                         return log_oom();
-                combined = NULL;
+
+                TAKE_PTR(combined);
                 free(prev);
         } else {
                 /* A new item */
@@ -181,8 +182,9 @@ static int finish_item(
 
                 if (ordered_hashmap_put(h, i, combined) < 0)
                         return log_oom();
-                i = NULL;
-                combined = NULL;
+
+                TAKE_PTR(i);
+                TAKE_PTR(combined);
         }
 
         return 0;
diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index d3175b1b9de..78739d588d4 100644
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -1229,12 +1229,11 @@ int dns_resource_record_to_wire_format(DnsResourceRecord *rr, bool canonical) {
         assert(packet._data);
 
         free(rr->wire_format);
-        rr->wire_format = packet._data;
+        rr->wire_format = TAKE_PTR(packet._data);
         rr->wire_format_size = packet.size;
         rr->wire_format_rdata_offset = rds;
         rr->wire_format_canonical = canonical;
 
-        packet._data = NULL;
         dns_packet_unref(&packet);
 
         return 0;