[X2Go-Commits] [x2goserver] 76/99: X2Go/Server/Agent/NX/Options.pm: rename $options variable to $intermediate in intermediate_to_string () for internal consistency.

[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 1e81d805964933f9725ac896ffbaa97aa229321f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 29 08:08:01 2020 +0100

    X2Go/Server/Agent/NX/Options.pm: rename $options variable to $intermediate in intermediate_to_string () for internal consistency.
---
 X2Go/Server/Agent/NX/Options.pm | 8 ++++----
 debian/changelog                | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/X2Go/Server/Agent/NX/Options.pm b/X2Go/Server/Agent/NX/Options.pm
index b7ddcca3..af165bfe 100644
--- a/X2Go/Server/Agent/NX/Options.pm
+++ b/X2Go/Server/Agent/NX/Options.pm
@@ -267,17 +267,17 @@ sub intermediate_to_string {
   my $ret = undef;
   my $error_detected = 0;
 
-  my $options = shift;
+  my $intermediate = shift;
 
-  $error_detected = (!(validate_intermediate ($options)));
+  $error_detected = (!(validate_intermediate ($intermediate)));
 
   if (!($error_detected)) {
     # Last entry should contain the display port part only.
     # We can detect it through counting.
-    my $elements_left = @{$options};
+    my $elements_left = @{$intermediate};
 
     # Handle entries iteratively, merging them into one string.
-    foreach my $entry (@{$options}) {
+    foreach my $entry (@{$intermediate}) {
       --$elements_left;
 
       if (!defined ($entry)) {
diff --git a/debian/changelog b/debian/changelog
index 5494d6aa..a7b01e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -340,6 +340,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       errors.
     - X2Go/Server/Agent/NX/Options.pm: simplify error handling by splitting
       intermediate checking out into a separate subroutine.
+    - X2Go/Server/Agent/NX/Options.pm: rename $options variable to
+      $intermediate in intermediate_to_string () for internal consistency.
   * 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