From: Stefan Metzmacher Date: Wed, 5 Feb 2025 13:40:43 +0000 (+0100) Subject: librpc/ndr: apply some const to ndr_push_union_blob() X-Git-Tag: tdb-1.4.13~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30b7181d0a42e06d53b87d912f1cf987a2a4ae93;p=thirdparty%2Fsamba.git librpc/ndr: apply some const to ndr_push_union_blob() Keep libndr at 6.0.0, this has not been released yet. Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Feb 6 10:45:52 UTC 2025 on atb-devel-224 --- diff --git a/librpc/ABI/ndr-6.0.0.sigs b/librpc/ABI/ndr-6.0.0.sigs index e68248f2016..0969af5db06 100644 --- a/librpc/ABI/ndr-6.0.0.sigs +++ b/librpc/ABI/ndr-6.0.0.sigs @@ -245,7 +245,7 @@ ndr_push_uint32: enum ndr_err_code (struct ndr_push *, ndr_flags_type, uint32_t) ndr_push_uint3264: enum ndr_err_code (struct ndr_push *, ndr_flags_type, uint32_t) ndr_push_uint8: enum ndr_err_code (struct ndr_push *, ndr_flags_type, uint8_t) ndr_push_union_align: enum ndr_err_code (struct ndr_push *, size_t) -ndr_push_union_blob: enum ndr_err_code (DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_push_flags_fn_t) +ndr_push_union_blob: enum ndr_err_code (DATA_BLOB *, TALLOC_CTX *, const void *, uint32_t, ndr_push_flags_fn_t) ndr_push_unique_ptr: enum ndr_err_code (struct ndr_push *, const void *) ndr_push_winreg_Data: enum ndr_err_code (struct ndr_push *, ndr_flags_type, const union winreg_Data *) ndr_push_winreg_Data_GPO: enum ndr_err_code (struct ndr_push *, ndr_flags_type, const union winreg_Data_GPO *) diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 9f1d7ac9107..344f08b20a1 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -632,7 +632,7 @@ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, con enum ndr_err_code ndr_push_struct_into_fixed_blob(DATA_BLOB *blob, const void *p, ndr_push_flags_fn_t fn); -enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p, uint32_t level, ndr_push_flags_fn_t fn); +enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, const void *p, uint32_t level, ndr_push_flags_fn_t fn); size_t ndr_size_struct(const void *p, libndr_flags flags, ndr_push_flags_fn_t push); size_t ndr_size_union(const void *p, libndr_flags flags, uint32_t level, ndr_push_flags_fn_t push); uint32_t ndr_push_get_relative_base_offset(struct ndr_push *ndr); diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index c25e8bd1ca5..896f682d2c2 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -1668,7 +1668,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_struct_into_fixed_blob( /* push a union to a blob using NDR */ -_PUBLIC_ enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p, +_PUBLIC_ enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, const void *p, uint32_t level, ndr_push_flags_fn_t fn) { struct ndr_push *ndr;