lib/util Split data_blob_hex_string() into upper and lower

[samba.git] / source4 / lib / registry / util.c

diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c
index 471c42500278579613d935f2e51e203a4e54c2ca..038b23fc8743b92e1cb300c4e93a9a669c28ac8d 100644 (file)
--- a/source4/lib/registry/util.c
+++ b/source4/lib/registry/util.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "librpc/gen_ndr/winreg.h"
-#include "param/param.h"
 
 /**
  * @file
@@ -66,10 +65,10 @@ _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx,
                case REG_SZ:
                        convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UTF16, CH_UNIX,
                                              data.data, data.length,
-                                             (void **)&ret);
+                                             (void **)&ret, NULL, false);
                        return ret;
                case REG_BINARY:
-                       ret = data_blob_hex_string(mem_ctx, &data);
+                       ret = data_blob_hex_string_upper(mem_ctx, &data);
                        return ret;
                case REG_DWORD:
                        if (*(int *)data.data == 0)
@@ -124,9 +123,9 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx,
        {
                case REG_SZ:
                case REG_EXPAND_SZ:
-               data->length = convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UNIX, CH_UTF16,
+               convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UNIX, CH_UTF16,
                                                     data_str, strlen(data_str),
-                                                    (void **)&data->data);
+                                                    (void **)&data->data, &data->length, false);
                        break;
 
                case REG_DWORD: {