registry3: Move registry_value_cmp() to its only user

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/registry/reg_api_util.c b/source3/registry/reg_api_util.c
index a2c84c0251aa3e611a62942bceee386e75ef0e5a..2eca74ead936a404c744800a4d26b45ea047d1ca 100644 (file)
--- a/source3/registry/reg_api_util.c
+++ b/source3/registry/reg_api_util.c
@@ -82,11 +82,3 @@ WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
        *pkey = key;
        return WERR_OK;
 }
-
-int registry_value_cmp(const struct registry_value* v1, const struct registry_value* v2)
-{
-       if (v1->type == v2->type) {
-               return data_blob_cmp(&v1->data, &v2->data);
-       }
-       return v1->type - v2->type;
-}

diff --git a/source3/registry/reg_api_util.h b/source3/registry/reg_api_util.h
index cf003273043492ed71e4cc56750a1a4f241cebcb..67c77a00073c789b234accac038c6015af1e6e60 100644 (file)
--- a/source3/registry/reg_api_util.h
+++ b/source3/registry/reg_api_util.h
@@ -32,6 +32,4 @@ WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
                     uint32_t desired_access, const struct security_token *token,
                     struct registry_key **pkey);
 
-int registry_value_cmp(const struct registry_value *v1, const struct registry_value *v2);
-
 #endif /* _REG_API_UTIL_H */

diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 389e3f6a5527cfc301fb7172992008edd4ed114c..23e1dc0adbd53c66345ca83c79affd170542e10d 100644 (file)
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -1135,6 +1135,15 @@ done:
        return werr;
 }
 
+static int registry_value_cmp(
+       const struct registry_value* v1, const struct registry_value* v2)
+{
+       if (v1->type == v2->type) {
+               return data_blob_cmp(&v1->data, &v2->data);
+       }
+       return v1->type - v2->type;
+}
+
 static WERROR precheck_create_val(struct precheck_ctx *ctx,
                                  struct registry_key *parent,
                                  const char *name,