diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-06-18 01:58:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:24 -0500 |
| commit | d4d6d0d2e54510690fa3f868ad02625bc24e5b9d (patch) | |
| tree | 402ba051d69c73380da567fa30e29ac50bb863cd /source4/librpc/ndr | |
| parent | 777b4b021456f5bd8bbadfe97532efc13286e581 (diff) | |
| download | samba-d4d6d0d2e54510690fa3f868ad02625bc24e5b9d.tar.gz samba-d4d6d0d2e54510690fa3f868ad02625bc24e5b9d.tar.bz2 samba-d4d6d0d2e54510690fa3f868ad02625bc24e5b9d.zip | |
r7706: Move ParseExpr() to util.
(This used to be commit 72efb695291f0ad3cdc80daa9f979454f6a81c04)
Diffstat (limited to 'source4/librpc/ndr')
| -rw-r--r-- | source4/librpc/ndr/ndr_string.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c index 95e9df39f0..134e4b8059 100644 --- a/source4/librpc/ndr/ndr_string.c +++ b/source4/librpc/ndr/ndr_string.c @@ -618,17 +618,16 @@ NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, char **var, uint3 NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, int chset) { - int ret; + ssize_t ret; NDR_PUSH_NEED_BYTES(ndr, byte_mul*length); ret = convert_string(CH_UNIX, chset, var, length, - ndr->data+ndr->offset, - byte_mul*length); + ndr->data+ndr->offset, byte_mul*length); if (ret == -1) { return ndr_push_error(ndr, NDR_ERR_CHARCNV, "Bad character conversion"); } - ndr->offset += byte_mul*length; + ndr->offset += ret; return NT_STATUS_OK; } |