svn commit: samba r7729 - in branches/SAMBA_4_0/source: build/pidl
librpc/idl
jelmer at samba.org
jelmer at samba.org
Sat Jun 18 16:31:49 GMT 2005
Author: jelmer
Date: 2005-06-18 16:31:48 +0000 (Sat, 18 Jun 2005)
New Revision: 7729
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7729
Log:
Small fixes to the charset stuff.
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr.pm
branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
branches/SAMBA_4_0/source/build/pidl/validator.pm
branches/SAMBA_4_0/source/librpc/idl/echo.idl
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-06-18 13:39:51 UTC (rev 7728)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-06-18 16:31:48 UTC (rev 7729)
@@ -10,6 +10,12 @@
use strict;
use pidl::typelist;
+sub nonfatal($$)
+{
+ my ($e,$s) = @_;
+ warn ("$e->{FILE}:$e->{LINE}: Warning: $s\n");
+}
+
#####################################################################
# return a table describing the order in which the parts of an element
# should be parsed
@@ -172,6 +178,19 @@
});
}
+ if (scalar(@size_is) > 0) {
+ nonfatal($e, "size_is() on non-array element");
+ }
+
+ if (scalar(@length_is) > 0) {
+ nonfatal($e, "length_is() on non-array element");
+ }
+
+ if (util::has_property($e, "string")) {
+ nonfatal($e, "string() attribute on non-array element");
+ }
+
+
push (@$order, {
TYPE => "DATA",
DATA_TYPE => $e->{TYPE},
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-06-18 13:39:51 UTC (rev 7728)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-06-18 16:31:48 UTC (rev 7729)
@@ -529,7 +529,7 @@
my $nl = Ndr::GetNextLevel($e, $l);
if (util::has_property($e, "charset")) {
- pidl "NDR_CHECK(ndr_push_charset($ndr, $ndr_flags, $var_name, $length, sizeof(" . typelist::mapType($nl->{DATA_TYPE}) . "), $e->{PROPERTIES}->{charset}));";
+ pidl "NDR_CHECK(ndr_push_charset($ndr, $ndr_flags, $var_name, $length, sizeof(" . typelist::mapType($nl->{DATA_TYPE}) . "), CH_$e->{PROPERTIES}->{charset}));";
} else {
pidl "NDR_CHECK(ndr_push_array_$nl->{DATA_TYPE}($ndr, $ndr_flags, $var_name, $length));";
}
@@ -831,7 +831,7 @@
my $nl = Ndr::GetNextLevel($e, $l);
if (util::has_property($e, "charset")) {
- pidl "NDR_CHECK(ndr_pull_charset($ndr, $ndr_flags, ".get_pointer_to($var_name).", $length, sizeof(" . typelist::mapType($nl->{DATA_TYPE}) . "), $e->{PROPERTIES}->{charset}));";
+ pidl "NDR_CHECK(ndr_pull_charset($ndr, $ndr_flags, ".get_pointer_to($var_name).", $length, sizeof(" . typelist::mapType($nl->{DATA_TYPE}) . "), CH_$e->{PROPERTIES}->{charset}));";
} else {
pidl "NDR_CHECK(ndr_pull_array_$nl->{DATA_TYPE}($ndr, $ndr_flags, $var_name, $length));";
if ($l->{IS_ZERO_TERMINATED}) {
Modified: branches/SAMBA_4_0/source/build/pidl/validator.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/validator.pm 2005-06-18 13:39:51 UTC (rev 7728)
+++ branches/SAMBA_4_0/source/build/pidl/validator.pm 2005-06-18 16:31:48 UTC (rev 7729)
@@ -12,15 +12,13 @@
# signal a fatal validation error
sub fatal($$)
{
- my $pos = shift;
- my $s = shift;
+ my ($pos,$s) = @_;
die("$pos->{FILE}:$pos->{LINE}:$s\n");
}
sub nonfatal($$)
{
- my $pos = shift;
- my $s = shift;
+ my ($pos,$s) = @_;
warn ("$pos->{FILE}:$pos->{LINE}:warning:$s\n");
}
@@ -46,8 +44,7 @@
# find a sibling var in a structure
sub find_sibling($$)
{
- my($e) = shift;
- my($name) = shift;
+ my($e,$name) = @_;
my($fn) = $e->{PARENT};
if ($name =~ /\*(.*)/) {
@@ -61,7 +58,6 @@
return undef;
}
-
my %property_list = (
# interface
"helpstring" => ["INTERFACE", "FUNCTION"],
@@ -140,8 +136,7 @@
# check for unknown properties
sub ValidProperties($$)
{
- my $e = shift;
- my $t = shift;
+ my ($e,$t) = @_;
return unless defined $e->{PROPERTIES};
@@ -172,7 +167,6 @@
return undef;
}
-
#####################################################################
# parse a struct
sub ValidElement($)
Modified: branches/SAMBA_4_0/source/librpc/idl/echo.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/echo.idl 2005-06-18 13:39:51 UTC (rev 7728)
+++ branches/SAMBA_4_0/source/librpc/idl/echo.idl 2005-06-18 16:31:48 UTC (rev 7729)
@@ -34,8 +34,8 @@
/* test strings */
void echo_TestCall (
- [in,string,charset(CH_UTF16)] uint16 *s1,
- [out,string,charset(CH_UTF16)] uint16 *s2
+ [in,string,charset(UTF16)] uint16 *s1,
+ [out,string,charset(UTF16)] uint16 *s2
);
More information about the samba-cvs
mailing list