r17316: More C++ warnings -- 456 left

[gd/samba-autobuild/.git] / source3 / lib / data_blob.c

diff --git a/source3/lib/data_blob.c b/source3/lib/data_blob.c
index 860ef5ad10f845ff2a6cd441f0407afb9cb2071d..4d5dda2435973c8d75c1fe86ac82654703d9008e 100644 (file)
--- a/source3/lib/data_blob.c
+++ b/source3/lib/data_blob.c
@@ -47,9 +47,9 @@ DATA_BLOB data_blob(const void *p, size_t length)
        }
 
        if (p) {
-               ret.data = smb_xmemdup(p, length);
+               ret.data = (uint8 *)smb_xmemdup(p, length);
        } else {
-               ret.data = SMB_XMALLOC_ARRAY(unsigned char, length);
+               ret.data = SMB_XMALLOC_ARRAY(uint8, length);
        }
        ret.length = length;
        ret.free = free_data_blob;
@@ -70,11 +70,11 @@ DATA_BLOB data_blob_talloc(TALLOC_CTX *mem_ctx, const void *p, size_t length)
        }
 
        if (p) {
-               ret.data = TALLOC_MEMDUP(mem_ctx, p, length);
+               ret.data = (uint8 *)TALLOC_MEMDUP(mem_ctx, p, length);
                if (ret.data == NULL)
                        smb_panic("data_blob_talloc: talloc_memdup failed.\n");
        } else {
-               ret.data = TALLOC(mem_ctx, length);
+               ret.data = (uint8 *)TALLOC(mem_ctx, length);
                if (ret.data == NULL)
                        smb_panic("data_blob_talloc: talloc failed.\n");
        }