diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-06-29 14:17:44 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-07-02 12:46:19 +0200 |
| commit | d70f15f5aa92ade72355c0f54e6a306edbfddafb (patch) | |
| tree | d70a69a8b76b451892489660748d3c9b8f62561b /src/resolve | |
| parent | 64903d18dfd0344d5af3c0f8006b2e220de90091 (diff) | |
| download | systemd-d70f15f5aa92ade72355c0f54e6a306edbfddafb.tar.gz | |
resolved: rename field to indicate that it's a list
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/resolved-bus.c | 6 | ||||
| -rw-r--r-- | src/resolve/resolved-conf.c | 4 | ||||
| -rw-r--r-- | src/resolve/resolved-dnssd.c | 6 | ||||
| -rw-r--r-- | src/resolve/resolved-dnssd.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index e19d3de8ea..9e7d1cc380 100644 --- 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 babd19b925..3176692c5f 100644 --- 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 169c942308..c5b3804889 100644 --- 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 219c0ddfea..e978a0d5fc 100644 --- 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); }; |