diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-07-12 20:16:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:10:07 -0500 |
| commit | da722e8520e85b5a3414f4b3b991ad7b6ed75468 (patch) | |
| tree | e32839a9db6f8046ade5cf34810a537f44a88d21 /source4 | |
| parent | b73a3ad21b0df7f4f1071269e5aaa78d3fa570de (diff) | |
| download | samba-da722e8520e85b5a3414f4b3b991ad7b6ed75468.tar.gz samba-da722e8520e85b5a3414f4b3b991ad7b6ed75468.tar.bz2 samba-da722e8520e85b5a3414f4b3b991ad7b6ed75468.zip | |
r16996: use the correct types, merge from samba3
metze
(This used to be commit dd81e7e5c71af36499746ba100ce48fedd240dce)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/ndr/ndr_string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c index 5485f3ff5d..8d27b2cba9 100644 --- a/source4/librpc/ndr/ndr_string.c +++ b/source4/librpc/ndr/ndr_string.c @@ -556,7 +556,7 @@ _PUBLIC_ NTSTATUS ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t cou return NT_STATUS_OK; } -_PUBLIC_ NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, int chset) +_PUBLIC_ NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset) { int ret; if (length == 0) { @@ -584,7 +584,7 @@ _PUBLIC_ NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const ch return NT_STATUS_OK; } -_PUBLIC_ NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, int chset) +_PUBLIC_ NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, charset_t chset) { ssize_t ret, required; @@ -614,7 +614,7 @@ _PUBLIC_ NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const ch } /* Return number of elements in a string in the specified charset */ -_PUBLIC_ uint32_t ndr_charset_length(const void *var, int chset) +_PUBLIC_ uint32_t ndr_charset_length(const void *var, charset_t chset) { /* FIXME: Treat special chars special here, taking chset into account */ /* Also include 0 byte */ |