From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 22 Apr 2024 10:23:03 +0000 (+0200)
Subject: resolved: rename DnssdService.filename field to .path
X-Git-Tag: v256-rc1~71^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=407630164e20f0555cd9b20f38e35a0555c1af63;p=thirdparty%2Fsystemd.git

resolved: rename DnssdService.filename field to .path

It contains a full path, not just a filename, hence name it
appropriately.
---

diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index aadac3f1025..6837b0e1404 100644
--- a/src/resolve/resolved-dnssd.c
+++ b/src/resolve/resolved-dnssd.c
@@ -48,7 +48,7 @@ DnssdService *dnssd_service_free(DnssdService *service) {
 
         dnssd_txtdata_free_all(service->txt_data_items);
 
-        free(service->filename);
+        free(service->path);
         free(service->name);
         free(service->type);
         free(service->subtype);
@@ -67,7 +67,7 @@ void dnssd_service_clear_on_reload(Hashmap *services) {
                 }
 }
 
-static int dnssd_service_load(Manager *manager, const char *filename) {
+static int dnssd_service_load(Manager *manager, const char *path) {
         _cleanup_(dnssd_service_freep) DnssdService *service = NULL;
         _cleanup_(dnssd_txtdata_freep) DnssdTxtData *txt_data = NULL;
         char *d;
@@ -75,17 +75,17 @@ static int dnssd_service_load(Manager *manager, const char *filename) {
         int r;
 
         assert(manager);
-        assert(filename);
+        assert(path);
 
         service = new0(DnssdService, 1);
         if (!service)
                 return log_oom();
 
-        service->filename = strdup(filename);
-        if (!service->filename)
+        service->path = strdup(path);
+        if (!service->path)
                 return log_oom();
 
-        service->name = strdup(basename(filename));
+        service->name = strdup(basename(path));
         if (!service->name)
                 return log_oom();
 
@@ -100,7 +100,7 @@ static int dnssd_service_load(Manager *manager, const char *filename) {
         dropin_dirname = strjoina(service->name, ".dnssd.d");
 
         r = config_parse_many(
-                        STRV_MAKE_CONST(filename), DNSSD_SERVICE_DIRS, dropin_dirname, /* root = */ NULL,
+                        STRV_MAKE_CONST(path), DNSSD_SERVICE_DIRS, dropin_dirname, /* root = */ NULL,
                         "Service\0",
                         config_item_perf_lookup, resolved_dnssd_gperf_lookup,
                         CONFIG_PARSE_WARN,
diff --git a/src/resolve/resolved-dnssd.h b/src/resolve/resolved-dnssd.h
index e7f2add397d..cb0059fe558 100644
--- a/src/resolve/resolved-dnssd.h
+++ b/src/resolve/resolved-dnssd.h
@@ -26,7 +26,7 @@ struct DnssdTxtData {
 };
 
 struct DnssdService {
-        char *filename;
+        char *path;
         char *name;
         char *name_template;
         char *type;