tree-wide: make private hash ops static

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 5bb4cddbdac82632b632c312dac0cba4e66c8174..3d2bf95d9930e69b26e8534a93c38cf23147f384 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -162,7 +162,7 @@ DEFINE_HASH_OPS(
         address_hash_func,
         address_compare_func);
 
-DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
         address_section_hash_ops,
         ConfigSection,
         config_section_hash_func,

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index ec2a7a334a65c8b227f8f4cb7dd2c5d2039fc130..2d84ba1db071e9c0d969011d9cc61c61e0d4dada 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -234,7 +234,7 @@ DEFINE_HASH_OPS_WITH_KEY_DESTRUCTOR(
                 route_compare_func,
                 route_unref);
 
-DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
                 route_section_hash_ops,
                 ConfigSection,
                 config_section_hash_func,

diff --git a/src/report/report.c b/src/report/report.c
index 3c2f89e00290941512dfda307a21a7e2f1816a6e..349d1fb15bd430abd74026b3da6c20f212e64a43 100644 (file)
--- a/src/report/report.c
+++ b/src/report/report.c
@@ -78,13 +78,10 @@ static void context_done(Context *context) {
 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(LinkInfo*, link_info_free);
-DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
                 link_info_hash_ops,
-                void,
-                trivial_hash_func,
-                trivial_compare_func,
-                LinkInfo,
-                link_info_free);
+                void, trivial_hash_func, trivial_compare_func,
+                LinkInfo, link_info_free);
 
 static int metric_compare(sd_json_variant *const *a, sd_json_variant *const *b) {
         const char *name_a, *name_b, *object_a, *object_b;

diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c
index 05e5bf424d312567f79bd5ce81978ad17c2f75ee..96f7c62670e055ae6712bb55294e281fb84f1f0b 100644 (file)
--- a/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@ -146,7 +146,7 @@ static int stub_packet_compare_func(const DnsPacket *x, const DnsPacket *y) {
         return memcmp(DNS_PACKET_HEADER(x), DNS_PACKET_HEADER(y), sizeof(DnsPacketHeader));
 }
 
-DEFINE_HASH_OPS(stub_packet_hash_ops, DnsPacket, stub_packet_hash_func, stub_packet_compare_func);
+DEFINE_PRIVATE_HASH_OPS(stub_packet_hash_ops, DnsPacket, stub_packet_hash_func, stub_packet_compare_func);
 
 static int reply_add_with_rrsig(
                 DnsAnswer **reply,

diff --git a/src/resolve/resolved-hook.c b/src/resolve/resolved-hook.c
index 6940b7ef1450be0114157ae28f410e600da049ed..5cec36c3aa2d62009748c95b65779dc1eb0598ba 100644 (file)
--- a/src/resolve/resolved-hook.c
+++ b/src/resolve/resolved-hook.c
@@ -328,7 +328,7 @@ static void manager_gc_hooks(Manager *m, usec_t seen_usec) {
         }
 }
 
-DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
                 hook_hash_ops,
                 char, string_hash_func, string_compare_func,
                 Hook, hook_unlink);

diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c
index f19db2a6eb00831a207072273b85840f5a633d3e..78e9ed377f3845f245b1a03e697bb2614cb00097 100644 (file)
--- a/src/shared/bus-polkit.c
+++ b/src/shared/bus-polkit.c
@@ -250,13 +250,10 @@ static AsyncPolkitQuery* async_polkit_query_free(AsyncPolkitQuery *q) {
 DEFINE_PRIVATE_TRIVIAL_REF_UNREF_FUNC(AsyncPolkitQuery, async_polkit_query, async_polkit_query_free);
 DEFINE_TRIVIAL_CLEANUP_FUNC(AsyncPolkitQuery*, async_polkit_query_unref);
 
-DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
                 async_polkit_query_hash_ops,
-                void,
-                trivial_hash_func,
-                trivial_compare_func,
-                AsyncPolkitQuery,
-                async_polkit_query_unref);
+                void, trivial_hash_func, trivial_compare_func,
+                AsyncPolkitQuery, async_polkit_query_unref);
 
 static int async_polkit_defer(sd_event_source *s, void *userdata) {
         AsyncPolkitQuery *q = ASSERT_PTR(userdata);

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 3666c1639845c049137f3c2ef52d39011583bf37..d125662410ba25fee6b0c7a57a9f5ad9b3dcba89 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1099,9 +1099,9 @@ static JsonData* json_data_free(JsonData *d) {
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(JsonData*, json_data_free);
 
-DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(json_data_hash_ops_free,
-                                      char, string_hash_func, string_compare_func,
-                                      JsonData, json_data_free);
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(json_data_hash_ops_free,
+                                              char, string_hash_func, string_compare_func,
+                                              JsonData, json_data_free);
 
 static int update_json_data(
                 Hashmap *h,

diff --git a/src/sysupdate/sysupdated.c b/src/sysupdate/sysupdated.c
index c123842c1084f7b220c1d9b86b49f70ace52c1f3..3fb88362e86aaa2498791603bdb6f20da5a7f191 100644 (file)
--- a/src/sysupdate/sysupdated.c
+++ b/src/sysupdate/sysupdated.c
@@ -184,8 +184,9 @@ static Job *job_free(Job *j) {
 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Job*, job_free);
-DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(job_hash_ops, uint64_t, uint64_hash_func, uint64_compare_func,
-                                      Job, job_free);
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(job_hash_ops,
+                                              uint64_t, uint64_hash_func, uint64_compare_func,
+                                              Job, job_free);
 
 static int job_new(JobType type, Target *t, sd_bus_message *msg, JobComplete complete_cb, Job **ret) {
         _cleanup_(job_freep) Job *j = NULL;
@@ -728,8 +729,9 @@ static Target *target_free(Target *t) {
 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Target*, target_free);
-DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(target_hash_ops, char, string_hash_func, string_compare_func,
-                                      Target, target_free);
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(target_hash_ops,
+                                              char, string_hash_func, string_compare_func,
+                                              Target, target_free);
 
 static int target_new(Manager *m, TargetClass class, const char *name, const char *path, Target **ret) {
         _cleanup_(target_freep) Target *t = NULL;