diff options
| author | Jeremy Allison <jra@samba.org> | 2011-06-01 14:49:03 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-06-01 23:53:07 +0200 |
| commit | db46a9d6348869794c0c0cf5d6c7079cdc334426 (patch) | |
| tree | 665587a5d50a484064a546768b3bc1f6eccf19b6 | |
| parent | b08bd96dc0919ae1194f1269c01a78194d674e9c (diff) | |
| download | samba-db46a9d6348869794c0c0cf5d6c7079cdc334426.tar.gz samba-db46a9d6348869794c0c0cf5d6c7079cdc334426.tar.bz2 samba-db46a9d6348869794c0c0cf5d6c7079cdc334426.zip | |
Fix type mixing warnings.
| -rw-r--r-- | librpc/ndr/ndr_string.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c index cf4d972072..4510a71082 100644 --- a/librpc/ndr/ndr_string.c +++ b/librpc/ndr/ndr_string.c @@ -147,7 +147,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, } else { if (!do_convert) { as = talloc_strndup(ndr->current_mem_ctx, - ndr->data + ndr->offset, + (char *)ndr->data + ndr->offset, conv_src_len); if (!as) { return ndr_pull_error(ndr, NDR_ERR_ALLOC, @@ -231,7 +231,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, int ndr_flags, if (!do_convert) { d_len = s_len; - dest = talloc_strndup(ndr, s, s_len); + dest = (uint8_t *)talloc_strndup(ndr, s, s_len); } else if (!convert_string_talloc(ndr, CH_UNIX, chset, s, s_len, (void **)(void *)&dest, &d_len)) { |