public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] applied: [PATCH 2/2] run command: use explicit return undef in closures on call sites
Date: Mon, 26 Feb 2024 15:10:20 +0100	[thread overview]
Message-ID: <20240226141020.296052-2-t.lamprecht@proxmox.com> (raw)
In-Reply-To: <20240226141020.296052-1-t.lamprecht@proxmox.com>

To avoid a misinterpretation of the auto-return value:

> In the absence of an explicit return, a subroutine, eval, or do FILE
> automatically returns the value of the last expression evaluated.
-- https://perldoc.perl.org/functions/return

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 Proxmox/Install.pm        | 5 +++++
 Proxmox/Install/RunEnv.pm | 1 +
 2 files changed, 6 insertions(+)

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index a0e1f5d..67093a1 100644
--- a/Proxmox/Install.pm
+++ b/Proxmox/Install.pm
@@ -121,6 +121,7 @@ sub create_filesystem {
 	} elsif ($line =~ m/Writing superblocks and filesystem.*done/) {
 	    update_progress(1, $rs, $re);
 	}
+	return;
     });
 }
 
@@ -358,6 +359,7 @@ sub get_pv_list_from_vgname {
 	} else {
 	    $res->{$vg_uuid}->{pvs} .= ", $pv";
 	}
+	return;
     };
     run_command("pvs --noheadings -o pv_name,vg_uuid -S vg_name='$vgname'", $parser, undef, 1);
 
@@ -903,6 +905,7 @@ sub extract_data {
 		my $frac = $per > 100 ? 1 : $per/100;
 		update_progress($frac, $maxper, 0.5);
 	    }
+	    return;
 	});
 
 	syscmd("mount -n -t tmpfs tmpfs $targetdir/tmp") == 0 || die "unable to mount tmpfs on $targetdir/tmp\n";
@@ -1004,6 +1007,7 @@ sub extract_data {
 		if ($line =~ m/^UUID=([A-Fa-f0-9\-]+)$/) {
 		    $fsuuid = $1;
 		}
+		return;
 	    });
 
 	    die "unable to detect FS UUID" if !defined($fsuuid);
@@ -1114,6 +1118,7 @@ _EOD
 	    if ($line =~ m/Setting up\s+(\S+)/) {
 		update_progress((++$count)/$pkg_count, 0.75, 0.95, "configuring $1");
 	    }
+	    return;
 	});
 
 	unlink "$targetdir/etc/mailname";
diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm
index d7ccea6..25b6bb3 100644
--- a/Proxmox/Install/RunEnv.pm
+++ b/Proxmox/Install/RunEnv.pm
@@ -212,6 +212,7 @@ my sub detect_country_tracing_to : prototype($$) {
 		    log_info("DC FOUND: $country\n");
 		    return CMD_FINISHED;
 		}
+		return;
 	    }
 	}, undef, undef, 1);
 
-- 
2.39.2





      reply	other threads:[~2024-02-26 14:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-26 14:10 [pve-devel] applied: [PATCH 1/2] run command: avoid using 1 as special value Thomas Lamprecht
2024-02-26 14:10 ` Thomas Lamprecht [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240226141020.296052-2-t.lamprecht@proxmox.com \
    --to=t.lamprecht@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal