The branch, master has been updated
via 30b7181d0a4 librpc/ndr: apply some const to ndr_push_union_blob()
from 0a48167044b vfs_gpfs: add gpfs:clamp_invalid_times
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 30b7181d0a42e06d53b87d912f1cf987a2a4ae93
Author: Stefan Metzmacher <[email protected]>
Date: Wed Feb 5 14:40:43 2025 +0100
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 <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Thu Feb 6 10:45:52 UTC 2025 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
librpc/ABI/ndr-6.0.0.sigs | 2 +-
librpc/ndr/libndr.h | 2 +-
librpc/ndr/ndr.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
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;
--
Samba Shared Repository
