Merge pull request #23855 from keszybz/drop-list-is-empty

[thirdparty/systemd.git] / src / resolve / resolved-dnssd.c

diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index 6ed55035b82f1c7a66956b7e2a8757aa8e6d63d0..84193eacc1d7ea2c5db0cd81c126392d44303895 100644 (file)
--- a/src/resolve/resolved-dnssd.c
+++ b/src/resolve/resolved-dnssd.c
@@ -17,7 +17,7 @@ DnssdTxtData *dnssd_txtdata_free(DnssdTxtData *txt_data) {
                 return NULL;
 
         dns_resource_record_unref(txt_data->rr);
-        dns_txt_item_free_all(txt_data->txt);
+        dns_txt_item_free_all(txt_data->txts);
 
         return mfree(txt_data);
 }
@@ -107,12 +107,12 @@ static int dnssd_service_load(Manager *manager, const char *filename) {
                                        "%s doesn't define service type",
                                        service->name);
 
-        if (LIST_IS_EMPTY(service->txt_data_items)) {
+        if (!service->txt_data_items) {
                 txt_data = new0(DnssdTxtData, 1);
                 if (!txt_data)
                         return log_oom();
 
-                r = dns_txt_item_new_empty(&txt_data->txt);
+                r = dns_txt_item_new_empty(&txt_data->txts);
                 if (r < 0)
                         return r;
 
@@ -200,16 +200,14 @@ int dnssd_load(Manager *manager) {
         STRV_FOREACH_BACKWARDS(f, files) {
                 r = dnssd_service_load(manager, *f);
                 if (r < 0)
-                        log_warning_errno(r, "Failed to load '%s': %m", *f);;
+                        log_warning_errno(r, "Failed to load '%s': %m", *f);
         }
 
         return 0;
 }
 
 int dnssd_update_rrs(DnssdService *s) {
-        _cleanup_free_ char *n = NULL;
-        _cleanup_free_ char *service_name = NULL;
-        _cleanup_free_ char *full_name = NULL;
+        _cleanup_free_ char *n = NULL, *service_name = NULL, *full_name = NULL;
         int r;
 
         assert(s);
@@ -239,7 +237,7 @@ int dnssd_update_rrs(DnssdService *s) {
                         goto oom;
 
                 txt_data->rr->ttl = MDNS_DEFAULT_TTL;
-                txt_data->rr->txt.items = dns_txt_item_copy(txt_data->txt);
+                txt_data->rr->txt.items = dns_txt_item_copy(txt_data->txts);
                 if (!txt_data->rr->txt.items)
                         goto oom;
         }