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

r9441: Use "const char *" for fixed-size arrays with charset() because

Browse Source 
these can require more elements in the local charset (usually UTF8) then
in the wire one.
(This used to be commit a0e63c2691f596cdacbc2e15404829ebca075429)
This commit is contained in:
Jelmer Vernooij 2005-08-21 01:59:41 +00:00 committed by Gerald (Jerry) Carter
parent 997da16d6c
commit df3248f108
3 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/build/pidl/Parse/Pidl/Samba/Header.pm
View File

@ -59,14 +59,16 @@ sub HeaderElement($)
my $numstar = $element->{POINTERS};
foreach (@{$element->{ARRAY_LEN}})
{
next if is_constant($_);
next if is_constant($_) and
not has_property($element, "charset");
$numstar++;
}
$numstar-- if Parse::Pidl::Typelist::scalar_is_reference($element->{TYPE});
pidl "*" foreach (1..$numstar);
pidl $element->{NAME};
foreach (@{$element->{ARRAY_LEN}}) {
next unless is_constant($_);
next unless (is_constant($_) and
not has_property($element, "charset"));
pidl "[$_]";
}
@ -199,11 +201,7 @@ sub HeaderType($$$)
}
if (has_property($e, "charset")) {
if ($e->{POINTERS} > 0) {
pidl "const char";
} else {
pidl "char";
}
pidl "const char";
} else {
pidl mapType($e->{TYPE});
}

56
source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
View File

@ -61,6 +61,19 @@ sub has_fast_array($$)
return ($t->{NAME} eq "uint8") or ($t->{NAME} eq "string");
}
sub is_charset_array($$)
{
my ($e,$l) = @_;
return 0 if ($l->{TYPE} ne "ARRAY");
my $nl = GetNextLevel($e,$l);
return 0 unless ($nl->{TYPE} eq "DATA");
return has_property($e, "charset");
}
sub get_pointer_to($)
{
my $var_name = shift;
@ -333,7 +346,7 @@ sub ParseArrayPullHeader($$$$$)
defer "}"
}
if (!$l->{IS_FIXED}) {
if (not $l->{IS_FIXED} and not is_charset_array($e, $l)) {
AllocateArrayLevel($e,$l,$ndr,$env,$size);
}
@ -545,7 +558,8 @@ sub ParseElementPushLevel
my $ndr_flags = CalcNdrFlags($l, $primitives, $deferred);
if ($l->{TYPE} eq "ARRAY" and ($l->{IS_CONFORMANT} or $l->{IS_VARYING})) {
if ($l->{TYPE} eq "ARRAY" and ($l->{IS_CONFORMANT} or $l->{IS_VARYING}
or is_charset_array($e, $l))) {
$var_name = get_pointer_to($var_name);
}
@ -562,8 +576,8 @@ sub ParseElementPushLevel
my $nl = GetNextLevel($e, $l);
# Allow speedups for arrays of scalar types
if (has_property($e, "charset")) {
pidl "NDR_CHECK(ndr_push_charset($ndr, $ndr_flags, $var_name, $length, sizeof(" . Parse::Pidl::Typelist::mapType($nl->{DATA_TYPE}) . "), CH_$e->{PROPERTIES}->{charset}));";
if (is_charset_array($e,$l)) {
pidl "NDR_CHECK(ndr_push_charset($ndr, $ndr_flags, $var_name, $length, sizeof(" . mapType($nl->{DATA_TYPE}) . "), CH_$e->{PROPERTIES}->{charset}));";
return;
} elsif (has_fast_array($e,$l)) {
pidl "NDR_CHECK(ndr_push_array_$nl->{DATA_TYPE}($ndr, $ndr_flags, $var_name, $length));";
@ -592,7 +606,7 @@ sub ParseElementPushLevel
pidl "}";
}
} elsif ($l->{TYPE} eq "ARRAY" and not has_fast_array($e,$l) and
not has_property($e, "charset")) {
not is_charset_array($e, $l)) {
my $length = ParseExpr($l->{LENGTH_IS}, $env);
my $counter = "cntr_$e->{NAME}_$l->{LEVEL_INDEX}";
@ -690,7 +704,8 @@ sub ParseElementPrint($$$)
} elsif ($l->{TYPE} eq "ARRAY") {
my $length;
if ($l->{IS_CONFORMANT} or $l->{IS_VARYING}) {
if ($l->{IS_CONFORMANT} or $l->{IS_VARYING} or
is_charset_array($e,$l)) {
$var_name = get_pointer_to($var_name);
}
@ -700,7 +715,7 @@ sub ParseElementPrint($$$)
$length = ParseExpr($l->{LENGTH_IS}, $env);
}
if (has_property($e, "charset")) {
if (is_charset_array($e,$l)) {
pidl "ndr_print_string(ndr, \"$e->{NAME}\", $var_name);";
last;
} elsif (has_fast_array($e, $l)) {
@ -741,7 +756,7 @@ sub ParseElementPrint($$$)
}
pidl "ndr->depth--;";
} elsif (($l->{TYPE} eq "ARRAY")
and not has_property($e, "charset")
and not is_charset_array($e,$l)
and not has_fast_array($e,$l)) {
pidl "free(idx_$l->{LEVEL_INDEX});";
deindent;
@ -895,7 +910,8 @@ sub ParseElementPullLevel
my $ndr_flags = CalcNdrFlags($l, $primitives, $deferred);
if ($l->{TYPE} eq "ARRAY" and ($l->{IS_VARYING} or $l->{IS_CONFORMANT})) {
if ($l->{TYPE} eq "ARRAY" and ($l->{IS_VARYING} or $l->{IS_CONFORMANT}
or is_charset_array($e,$l))) {
$var_name = get_pointer_to($var_name);
}
@ -910,8 +926,8 @@ sub ParseElementPullLevel
my $nl = GetNextLevel($e, $l);
if (has_property($e, "charset")) {
pidl "NDR_CHECK(ndr_pull_charset($ndr, $ndr_flags, ".get_pointer_to($var_name).", $length, sizeof(" . Parse::Pidl::Typelist::mapType($nl->{DATA_TYPE}) . "), CH_$e->{PROPERTIES}->{charset}));";
if (is_charset_array($e,$l)) {
pidl "NDR_CHECK(ndr_pull_charset($ndr, $ndr_flags, ".get_pointer_to($var_name).", $length, sizeof(" . mapType($nl->{DATA_TYPE}) . "), CH_$e->{PROPERTIES}->{charset}));";
return;
} elsif (has_fast_array($e, $l)) {
pidl "NDR_CHECK(ndr_pull_array_$nl->{DATA_TYPE}($ndr, $ndr_flags, $var_name, $length));";
@ -958,7 +974,7 @@ sub ParseElementPullLevel
pidl "}";
}
} elsif ($l->{TYPE} eq "ARRAY" and
not has_fast_array($e,$l) and not has_property($e, "charset")) {
not has_fast_array($e,$l) and not is_charset_array($e, $l)) {
my $length = ParseExpr($l->{LENGTH_IS}, $env);
my $counter = "cntr_$e->{NAME}_$l->{LEVEL_INDEX}";
my $array_name = $var_name;
@ -1162,7 +1178,7 @@ sub ParseEnumPull($$)
{
my($enum,$name) = @_;
my($type_fn) = $enum->{BASE_TYPE};
my($type_v_decl) = Parse::Pidl::Typelist::mapType($type_fn);
my($type_v_decl) = mapType($type_fn);
pidl "$type_v_decl v;";
start_flags($enum);
@ -1237,7 +1253,7 @@ sub ParseBitmapPull($$)
{
my($bitmap,$name) = @_;
my $type_fn = $bitmap->{BASE_TYPE};
my($type_decl) = Parse::Pidl::Typelist::mapType($bitmap->{BASE_TYPE});
my($type_decl) = mapType($bitmap->{BASE_TYPE});
pidl "$type_decl v;";
start_flags($bitmap);
@ -1252,7 +1268,7 @@ sub ParseBitmapPull($$)
sub ParseBitmapPrintElement($$$)
{
my($e,$bitmap,$name) = @_;
my($type_decl) = Parse::Pidl::Typelist::mapType($bitmap->{BASE_TYPE});
my($type_decl) = mapType($bitmap->{BASE_TYPE});
my($type_fn) = $bitmap->{BASE_TYPE};
my($flag);
@ -1270,7 +1286,7 @@ sub ParseBitmapPrintElement($$$)
sub ParseBitmapPrint($$)
{
my($bitmap,$name) = @_;
my($type_decl) = Parse::Pidl::Typelist::mapType($bitmap->{TYPE});
my($type_decl) = mapType($bitmap->{TYPE});
my($type_fn) = $bitmap->{BASE_TYPE};
start_flags($bitmap);
@ -1345,7 +1361,7 @@ sub DeclareArrayVariables($)
foreach my $l (@{$e->{LEVELS}}) {
next if has_fast_array($e,$l);
next if has_property($e, "charset");
next if is_charset_array($e,$l);
if ($l->{TYPE} eq "ARRAY") {
pidl "uint32_t cntr_$e->{NAME}_$l->{LEVEL_INDEX};";
}
@ -1358,7 +1374,7 @@ sub need_decl_mem_ctx($$)
my $l = shift;
return 0 if has_fast_array($e,$l);
return 0 if (has_property($e, "charset") and ($l->{TYPE} ne "POINTER"));
return 0 if is_charset_array($e,$l);
return 1 if (($l->{TYPE} eq "ARRAY") and not $l->{IS_FIXED});
if (($l->{TYPE} eq "POINTER") and ($l->{POINTER_TYPE} eq "ref")) {
@ -1639,7 +1655,7 @@ sub ParseUnionPull($$)
if (Parse::Pidl::Typelist::typeIs($switch_type, "ENUM")) {
$switch_type = Parse::Pidl::Typelist::enum_type_fn(getType($switch_type));
}
pidl Parse::Pidl::Typelist::mapType($switch_type) . " _level;";
pidl mapType($switch_type) . " _level;";
}
my %double_cases = ();
@ -1944,8 +1960,6 @@ sub AllocateArrayLevel($$$$$)
{
my ($e,$l,$ndr,$env,$size) = @_;
return if (has_property($e, "charset"));
my $var = ParseExpr($e->{NAME}, $env);
check_null_pointer($size);

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

@ -647,7 +647,7 @@ NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var,
NDR_PUSH_NEED_BYTES(ndr, required);
ret = convert_string(CH_UNIX, chset,
var, length,
var, strlen(var),
ndr->data+ndr->offset, required);
if (ret == -1) {
return ndr_push_error(ndr, NDR_ERR_CHARCNV,