svn commit: samba r5133 - in branches/SAMBA_4_0/source/build/pidl: .

[metze at samba.org]

Author: metze
Date: 2005-01-31 15:54:42 +0000 (Mon, 31 Jan 2005)
New Revision: 5133

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5133

Log:
fix type mapping to internal types

metze

Modified:
   branches/SAMBA_4_0/source/build/pidl/parser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/parser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/parser.pm	2005-01-31 13:26:00 UTC (rev 5132)
+++ branches/SAMBA_4_0/source/build/pidl/parser.pm	2005-01-31 15:54:42 UTC (rev 5133)
@@ -818,8 +818,9 @@
 {
 	my($enum) = shift;
 	my($type_fn) = util::enum_type_fn($enum);
+	my($type_v_decl) = util::map_type(util::enum_type_fn($enum));
 
-	pidl "\t$type_fn v;\n";
+	pidl "\t$type_v_decl v;\n";
 	start_flags($enum);
 	pidl "\tNDR_CHECK(ndr_pull_$type_fn(ndr, &v));\n";
 	pidl "\t*r = v;\n";
@@ -874,8 +875,9 @@
 {
 	my($bitmap) = shift;
 	my($type_fn) = util::bitmap_type_fn($bitmap);
+	my($type_decl) = util::bitmap_type_decl($bitmap);
 
-	pidl "\t$type_fn v;\n";
+	pidl "\t$type_decl v;\n";
 	start_flags($bitmap);
 	pidl "\tNDR_CHECK(ndr_pull_$type_fn(ndr, &v));\n";
 	pidl "\t*r = v;\n";
@@ -1298,7 +1300,7 @@
 	}
 
 	if ($e->{DATA}->{TYPE} eq "BITMAP") {
-		my $type_decl = util::bitmap_type_fn($e->{DATA});
+		my $type_decl = util::bitmap_type_decl($e->{DATA});
 		pidl $static . "NTSTATUS ndr_push_$e->{NAME}(struct ndr_push *ndr, $type_decl r)";
 		pidl "\n{\n";
 		ParseTypePush($e->{DATA});
@@ -1349,7 +1351,7 @@
 	}
 
 	if ($e->{DATA}->{TYPE} eq "BITMAP") {
-		my $type_decl = util::bitmap_type_fn($e->{DATA});
+		my $type_decl = util::bitmap_type_decl($e->{DATA});
 		pidl $static . "NTSTATUS ndr_pull_$e->{NAME}(struct ndr_pull *ndr, $type_decl *r)";
 		pidl "\n{\n";
 		ParseTypePull($e->{DATA});
@@ -1393,7 +1395,7 @@
 	}
 
 	if ($e->{DATA}->{TYPE} eq "BITMAP") {
-		my $type_decl = util::bitmap_type_fn($e->{DATA});
+		my $type_decl = util::bitmap_type_decl($e->{DATA});
 		pidl "void ndr_print_$e->{NAME}(struct ndr_print *ndr, const char *name, $type_decl r)";
 		pidl "\n{\n";
 		ParseTypePrint($e->{DATA});