varlink: move definition of varlink_hash_ops into common code

This is truly useful whenever we have to deal with multiple varlink
connections.

diff --git a/src/import/importd.c b/src/import/importd.c
index 8603069047a08738684ded6b6560847a7e28d8df..e9923d93adea922b961d6963e6c79ed43002efad 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -130,8 +130,6 @@ static const char* const transfer_type_table[_TRANSFER_TYPE_MAX] = {
 
 DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(transfer_type, TransferType);
 
-DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(varlink_hash_ops, void, trivial_hash_func, trivial_compare_func, sd_varlink, sd_varlink_unref);
-
 static Transfer *transfer_unref(Transfer *t) {
         if (!t)
                 return NULL;

diff --git a/src/libsystemd/sd-varlink/varlink-util.c b/src/libsystemd/sd-varlink/varlink-util.c
index be7df731437510937fc08d8cb0fc2400b13bfbeb..7ae3a66af25a05ce3a1aa067625ac303d234735c 100644 (file)
--- a/src/libsystemd/sd-varlink/varlink-util.c
+++ b/src/libsystemd/sd-varlink/varlink-util.c
@@ -203,3 +203,11 @@ int varlink_check_privileged_peer(sd_varlink *vl) {
 
         return 0;
 }
+
+DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
+                varlink_hash_ops,
+                void,
+                trivial_hash_func,
+                trivial_compare_func,
+                sd_varlink,
+                sd_varlink_unref);

diff --git a/src/libsystemd/sd-varlink/varlink-util.h b/src/libsystemd/sd-varlink/varlink-util.h
index 3a340b221653d8260fac3a5dd6658c68c9fb7531..929f5b04cf7b2c511c09f0b453bc642597e38b34 100644 (file)
--- a/src/libsystemd/sd-varlink/varlink-util.h
+++ b/src/libsystemd/sd-varlink/varlink-util.h
@@ -27,3 +27,5 @@ int varlink_server_new(
                 void *userdata);
 
 int varlink_check_privileged_peer(sd_varlink *vl);
+
+extern const struct hash_ops varlink_hash_ops;