sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

r22667: revert revision 22640 as it breaks nested structs in idl

Browse Source 
metze
(This used to be commit b5c84460fc8599fbd894bcf8c4f7b440e2424af1)
This commit is contained in:
Stefan Metzmacher 2007-05-04 10:44:41 +00:00 committed by Gerald (Jerry) Carter
parent 1477b7a24f
commit c83c6740ab
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
View File

@ -43,7 +43,7 @@ sub HeaderProperties($$)
}
if ($ret) {
pidl " /* [" . substr($ret, 0, -1) . "] */";
pidl "/* [" . substr($ret, 0, -1) . "] */";
}
}
@ -108,12 +108,10 @@ sub HeaderStruct($$)
pidl tabs()."char _empty_;\n";
}
$tab_depth--;
pidl "};";
pidl tabs()."}";
if (defined $struct->{PROPERTIES}) {
HeaderProperties($struct->{PROPERTIES}, []);
}
pidl "\n\n";
}
#####################################################################
@ -134,10 +132,10 @@ sub HeaderEnum($$)
}
pidl "\n";
$tab_depth--;
pidl "};\n";
pidl "}\n";
pidl "#else\n";
my $count = 0;
pidl "enum $name { __donnot_use_enum_$name=0x7FFFFFFF};\n";
pidl "enum $name { __donnot_use_enum_$name=0x7FFFFFFF}\n";
my $with_val = 0;
my $without_val = 0;
foreach my $e (@{$enum->{ELEMENTS}}) {
@ -193,12 +191,11 @@ sub HeaderUnion($$)
}
}
$tab_depth--;
pidl "}";
pidl "};";
if (defined $union->{PROPERTIES}) {
HeaderProperties($union->{PROPERTIES}, []);
}
pidl "\n\n";
}
#####################################################################
@ -300,7 +297,7 @@ sub HeaderFunction($)
HeaderFunctionInOut($fn, "in");
HeaderFunctionInOut($fn, "inout");
$tab_depth--;
pidl tabs()."} in;\n";
pidl tabs()."} in;\n\n";
$needed++;
}
@ -314,7 +311,7 @@ sub HeaderFunction($)
pidl tabs().mapTypeName($fn->{RETURN_TYPE}) . " result;\n";
}
$tab_depth--;
pidl tabs()."} out;\n";
pidl tabs()."} out;\n\n";
$needed++;
}
@ -365,6 +362,11 @@ sub HeaderInterface($)
HeaderUnion($d, $d->{NAME}) if ($d->{TYPE} eq "UNION");
HeaderEnum($d, $d->{NAME}) if ($d->{TYPE} eq "ENUM");
HeaderBitmap($d, $d->{NAME}) if ($d->{TYPE} eq "BITMAP");
pidl ";\n\n" if ($d->{TYPE} eq "BITMAP" or
$d->{TYPE} eq "STRUCT" or
$d->{TYPE} eq "TYPEDEF" or
$d->{TYPE} eq "UNION" or
$d->{TYPE} eq "ENUM");
}
foreach my $d (@{$interface->{DATA}}) {