pidl s4::Python: silence warnings
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Sat, 30 Nov 2019 11:43:52 +0000 (00:43 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 10 Dec 2019 02:53:35 +0000 (02:53 +0000)
- do not redeclare variables in the same scope.
- use $1 instead of \1, which perl just prefers.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
pidl/lib/Parse/Pidl/Samba4/Python.pm

index 6f5bc69f3b8dc148d694a569ece2a2cbc5571c39..84d4dade512db7a5ded39e07cef09a14eca818bf 100644 (file)
@@ -38,7 +38,7 @@ sub PrettifyTypeName($$)
 {
        my ($name, $basename) = @_;
 
-       $basename =~ s/^.*\.([^.]+)$/\1/;
+       $basename =~ s/^.*\.([^.]+)$/$1/;
 
        $name =~ s/^$basename\_//;
 
@@ -190,7 +190,6 @@ sub PythonElementGetSet($$$$$$) {
        $self->indent;
        $self->pidl("$cname *object = ($cname *)pytalloc_get_ptr(py_obj);");
        my $mem_ctx = "pytalloc_get_mem_ctx(py_obj)";
-       my $l = $e->{LEVELS}[0];
        my $nl = GetNextLevel($e, $l);
        if ($l->{TYPE} eq "POINTER" and
                not ($nl->{TYPE} eq "ARRAY" and ($nl->{IS_FIXED} or is_charset_array($e, $nl))) and
@@ -1479,9 +1478,9 @@ sub Interface($$$)
 
                $self->pidl("");
 
-               my $signature = "\"$interface->{NAME}_abstract_syntax()\\n\"";
+               $signature = "\"$interface->{NAME}_abstract_syntax()\\n\"";
 
-               my $docstring = $self->DocString($interface, $interface->{NAME}."_syntax");
+               $docstring = $self->DocString($interface, $interface->{NAME}."_syntax");
 
                if ($docstring) {
                        $docstring = "$signature$docstring";