resolved: rename field to indicate that it's a list

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index e19d3de8ea75a377cc316ae3a99df29a9f655e6a..9e7d1cc380c097e584774716b722ceac3cb468dd 100644 (file)
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -1988,7 +1988,7 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata,
                         if (r < 0)
                                 return r;
 
-                        LIST_INSERT_AFTER(items, txt_data->txt, last, i);
+                        LIST_INSERT_AFTER(items, txt_data->txts, last, i);
                         last = i;
 
                         r = sd_bus_message_exit_container(message);
@@ -2003,7 +2003,7 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata,
                 if (r < 0)
                         return r;
 
-                if (txt_data->txt) {
+                if (txt_data->txts) {
                         LIST_PREPEND(items, service->txt_data_items, txt_data);
                         txt_data = NULL;
                 }
@@ -2022,7 +2022,7 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata,
                 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;
 

diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index babd19b925fa0a0edceff8a9b3fb147a475ac0a8..3176692c5f8af566ab5b2b1f041eb035b8b36821 100644 (file)
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -390,11 +390,11 @@ int config_parse_dnssd_txt(
                         assert_not_reached();
                 }
 
-                LIST_INSERT_AFTER(items, txt_data->txt, last, i);
+                LIST_INSERT_AFTER(items, txt_data->txts, last, i);
                 last = i;
         }
 
-        if (txt_data->txt) {
+        if (txt_data->txts) {
                 LIST_PREPEND(items, s->txt_data_items, txt_data);
                 TAKE_PTR(txt_data);
         }

diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index 169c942308a9f5c1ec158e4d6ae431f1a429c1a7..c5b3804889514945d27d14b76c76f237c5addb91 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);
 }
@@ -112,7 +112,7 @@ static int dnssd_service_load(Manager *manager, const char *filename) {
                 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;
 
@@ -237,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;
         }

diff --git a/src/resolve/resolved-dnssd.h b/src/resolve/resolved-dnssd.h
index 219c0ddfea281e75cccfa12cc8faf1058f867607..e978a0d5fc6ec4e16522bf05f7831a23144ade8f 100644 (file)
--- a/src/resolve/resolved-dnssd.h
+++ b/src/resolve/resolved-dnssd.h
@@ -13,13 +13,13 @@ typedef struct DnsTxtItem DnsTxtItem;
 
 enum {
         DNS_TXT_ITEM_TEXT,
-        DNS_TXT_ITEM_DATA
+        DNS_TXT_ITEM_DATA,
 };
 
 struct DnssdTxtData {
         DnsResourceRecord *rr;
 
-        LIST_HEAD(DnsTxtItem, txt);
+        LIST_HEAD(DnsTxtItem, txts);
 
         LIST_FIELDS(DnssdTxtData, items);
 };