[X2Go-Commits] [x2goserver] 18/99: X2Go/Server/Agent/NX/Options.pm: rename options parameter in transform_intermediate to intermediate.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 19901172aabbc26ecc10d841db52c57b47ad6775
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 7 05:52:30 2020 +0100

    X2Go/Server/Agent/NX/Options.pm: rename options parameter in transform_intermediate to intermediate.
---
 X2Go/Server/Agent/NX/Options.pm | 12 ++++++------
 debian/changelog                |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/X2Go/Server/Agent/NX/Options.pm b/X2Go/Server/Agent/NX/Options.pm
index 25d99b1f..b4b3c7fb 100644
--- a/X2Go/Server/Agent/NX/Options.pm
+++ b/X2Go/Server/Agent/NX/Options.pm
@@ -524,18 +524,18 @@ sub transform_intermediate {
   my $ret = undef;
   my $error_detected = 0;
 
-  my $options = shift;
+  my $intermediate = shift;
   my $mode = shift;
   my $option = shift;
 
-  if ('ARRAY' ne ref ($options)) {
-    print {*STDERR} 'Invalid options reference type passed (' . ref ($options) . "), erroring out.\n";
+  if ('ARRAY' ne ref ($intermediate)) {
+    print {*STDERR} 'Invalid options reference type passed (' . ref ($intermediate) . "), erroring out.\n";
     $error_detected = 1;
   }
 
   if (!($error_detected)) {
-    if (1 == scalar (@{$options})) {
-      foreach my $entry (@{$options}) {
+    if (1 == scalar (@{$intermediate})) {
+      foreach my $entry (@{$intermediate}) {
         if (!defined ($entry)) {
           print {*STDERR} "Invalid options array passed, erroring out.\n";
           $error_detected = 1;
@@ -576,7 +576,7 @@ sub transform_intermediate {
 
   if (!($error_detected)) {
     # Set return value to a *deep copy* of our original array.
-    $ret = dclone ($options);
+    $ret = dclone ($intermediate);
 
     my $elements_left = @{$ret};
 
diff --git a/debian/changelog b/debian/changelog
index 35978155..9ff9f95c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -214,6 +214,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
     - X2Go/Server/Agent/NX/Options.pm: whitespace-only in comment.
     - X2Go/Server/Agent/NX/Options.pm: add and use an enum-like construct as
       the internal mode selector for transforms.
+    - X2Go/Server/Agent/NX/Options.pm: rename options parameter in
+      transform_intermediate to intermediate.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git