diff options
author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2019-12-01 17:43:20 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2019-12-04 05:10:31 +0000 |
commit | 12f6698f76e29854d5097a266fb4e1658d88ae96 (patch) | |
tree | b9bcf6a97cc09015caf92437f563dee378f23b9c /pidl | |
parent | fd68ba8a10adf7439f842a787943b1ec4580d837 (diff) | |
download | samba-12f6698f76e29854d5097a266fb4e1658d88ae96.tar.gz |
pidl s4/TDR: use conventional ->{res} name
rather than ->{ret}, meaning this class can be moved to a Pidl::Base subclass
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'pidl')
-rw-r--r-- | pidl/lib/Parse/Pidl/Samba4/TDR.pm | 10 | ||||
-rwxr-xr-x | pidl/tests/tdr.pl | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/pidl/lib/Parse/Pidl/Samba4/TDR.pm index c0749304ef3..77967414027 100644 --- a/pidl/lib/Parse/Pidl/Samba4/TDR.pm +++ b/pidl/lib/Parse/Pidl/Samba4/TDR.pm @@ -11,7 +11,7 @@ use Parse::Pidl::Typelist qw(mapTypeName); use Exporter; @ISA = qw(Exporter); -@EXPORT_OK = qw(ParserType $ret $ret_hdr); +@EXPORT_OK = qw(ParserType $res $res_hdr); use vars qw($VERSION); $VERSION = '0.01'; @@ -20,14 +20,14 @@ use strict; sub new($) { my ($class) = shift; - my $self = { ret => "", ret_hdr => "", tabs => "" }; + my $self = { res => "", res_hdr => "", tabs => "" }; bless($self, $class); } sub indent($) { my $self = shift; $self->{tabs}.="\t"; } sub deindent($) { my $self = shift; $self->{tabs} = substr($self->{tabs}, 1); } -sub pidl($$) { my $self = shift; $self->{ret} .= $self->{tabs}.(shift)."\n"; } -sub pidl_hdr($$) { my $self = shift; $self->{ret_hdr} .= (shift)."\n"; } +sub pidl($$) { my $self = shift; $self->{res} .= $self->{tabs}.(shift)."\n"; } +sub pidl_hdr($$) { my $self = shift; $self->{res_hdr} .= (shift)."\n"; } sub typearg($) { my $t = shift; return(", const char *name") if ($t eq "print"); @@ -277,7 +277,7 @@ sub Parser($$$$) $self->pidl_hdr(""); foreach (@$idl) { $self->ParserInterface($_) if ($_->{TYPE} eq "INTERFACE"); } - return ($self->{ret_hdr}, $self->{ret}); + return ($self->{res_hdr}, $self->{res}); } 1; diff --git a/pidl/tests/tdr.pl b/pidl/tests/tdr.pl index d6cd7a03d4c..41a560c842b 100755 --- a/pidl/tests/tdr.pl +++ b/pidl/tests/tdr.pl @@ -13,18 +13,18 @@ use Parse::Pidl::Samba4::TDR qw(ParserType); my $tdr = new Parse::Pidl::Samba4::TDR(); $tdr->ParserType({TYPE => "STRUCT", NAME => "foo", PROPERTIES => {public => 1}}, "pull"); -is($tdr->{ret}, "NTSTATUS tdr_pull_foo (struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, struct foo *v) +is($tdr->{res}, "NTSTATUS tdr_pull_foo (struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, struct foo *v) { return NT_STATUS_OK; } "); -is($tdr->{ret_hdr}, "NTSTATUS tdr_pull_foo (struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, struct foo *v);\n"); +is($tdr->{res_hdr}, "NTSTATUS tdr_pull_foo (struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, struct foo *v);\n"); $tdr = new Parse::Pidl::Samba4::TDR(); $tdr->ParserType({TYPE => "UNION", NAME => "bar", PROPERTIES => {public => 1}}, "pull"); -is($tdr->{ret}, "NTSTATUS tdr_pull_bar(struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, int level, union bar *v) +is($tdr->{res}, "NTSTATUS tdr_pull_bar(struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, int level, union bar *v) { switch (level) { } @@ -33,11 +33,11 @@ is($tdr->{ret}, "NTSTATUS tdr_pull_bar(struct tdr_pull *tdr, TALLOC_CTX *mem_ctx } "); -is($tdr->{ret_hdr}, "NTSTATUS tdr_pull_bar(struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, int level, union bar *v);\n"); +is($tdr->{res_hdr}, "NTSTATUS tdr_pull_bar(struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, int level, union bar *v);\n"); $tdr = new Parse::Pidl::Samba4::TDR(); $tdr->ParserType({TYPE => "UNION", NAME => "bar", PROPERTIES => {}}, "pull"); -is($tdr->{ret}, "static NTSTATUS tdr_pull_bar(struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, int level, union bar *v) +is($tdr->{res}, "static NTSTATUS tdr_pull_bar(struct tdr_pull *tdr, TALLOC_CTX *mem_ctx, int level, union bar *v) { switch (level) { } @@ -46,4 +46,4 @@ is($tdr->{ret}, "static NTSTATUS tdr_pull_bar(struct tdr_pull *tdr, TALLOC_CTX * } "); -is($tdr->{ret_hdr}, ""); +is($tdr->{res_hdr}, ""); |