sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

r8261: charset style strings in pidl should be const, just like old style ndr strings

Browse Source 
(This used to be commit aa0e1d6699959571963d6e6fb455b33c4436dcdf)
This commit is contained in:
Andrew Tridgell 2005-07-09 12:51:44 +00:00 committed by Gerald (Jerry) Carter
parent cd88764ba1
commit 5ed139f096
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/build/pidl/ndr_header.pm
View File

@ -214,7 +214,7 @@ sub HeaderType($$$)
}
if (util::has_property($e, "charset")) {
pidl "char";
pidl "const char";
} else {
pidl typelist::mapType($e->{TYPE});
}

8
source4/librpc/ndr/ndr_string.c
View File

@ -590,11 +590,11 @@ void ndr_print_string_array(struct ndr_print *ndr, const char *name, const char
}
/* Return number of elements in a string including the last (zeroed) element */
uint32_t ndr_string_length(void *_var, uint32_t element_size)
uint32_t ndr_string_length(const void *_var, uint32_t element_size)
{
uint32_t i;
uint8_t zero[4] = {0,0,0,0};
char *var = _var;
const char *var = _var;
for (i = 0; memcmp(var+i*element_size,zero,element_size) != 0; i++);
@ -618,14 +618,14 @@ NTSTATUS ndr_check_string_terminator(struct ndr_pull *ndr, const void *_var, uin
}
NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, char **var, uint32_t length, uint8_t byte_mul, int chset)
NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, int chset)
{
int ret;
NDR_PULL_NEED_BYTES(ndr, length*byte_mul);
ret = convert_string_talloc(ndr, chset, CH_UNIX,
ndr->data+ndr->offset,
length*byte_mul,
(void **)var);
discard_const_p(void *, var));
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");