diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-08 10:56:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:24 -0500 |
| commit | fe8e412f8d1e158dd810e8a726e6ffefda2914e4 (patch) | |
| tree | 77692783f702c164d137bce837e58ca579564810 /source4 | |
| parent | 14b8ce1b01b7ea8bbf4379dbed363dfa34b7e400 (diff) | |
| download | samba-fe8e412f8d1e158dd810e8a726e6ffefda2914e4.tar.gz samba-fe8e412f8d1e158dd810e8a726e6ffefda2914e4.tar.bz2 samba-fe8e412f8d1e158dd810e8a726e6ffefda2914e4.zip | |
r8242: support bitmap constants from ejs calls
(This used to be commit 0cf8c091a9f1e389eb2be036311d9e73d13e336d)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/pidl/ejs.pm | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/source4/build/pidl/ejs.pm b/source4/build/pidl/ejs.pm index 750c53e95f..08e577f875 100644 --- a/source4/build/pidl/ejs.pm +++ b/source4/build/pidl/ejs.pm @@ -465,12 +465,13 @@ sub EjsEnumPush($$) my $v = 0; # put the enum elements in the constants array foreach my $e (@{$d->{ELEMENTS}}) { - chomp $e; - if ($e =~ /^(.*)=\s*(.*)\s*$/) { - $e = $1; + my $el = $e; + chomp $el; + if ($el =~ /^(.*)=\s*(.*)\s*$/) { + $el = $1; $v = $2; } - $constants{$e} = $v; + $constants{$el} = $v; $v++; } pidl fn_prefix($d); @@ -489,6 +490,14 @@ sub EjsBitmapPush($$) my $d = shift; my $type_fn = $d->{BASE_TYPE}; my($type_decl) = typelist::mapType($d->{BASE_TYPE}); + # put the bitmap elements in the constants array + foreach my $e (@{$d->{ELEMENTS}}) { + if ($e =~ /^(\w*)\s*(.*)\s*$/) { + my $bname = $1; + my $v = $2; + $constants{$bname} = $v; + } + } pidl fn_prefix($d); pidl "NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const $type_decl *r)\n{\n"; pidl "return ejs_push_$type_fn(ejs, v, name, r);\n"; |