From 2fceea41e8eefe0e109d7b7de445589bfd2a49ef Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Fri, 29 Jan 2021 13:46:37 +0000
Subject: [PATCH] Always use for in Perl modules.

---
 configure              | 4 ++--
 make/calcdep.pl        | 2 +-
 make/configure.pm      | 8 ++++----
 make/template/inspircd | 4 ++--
 tools/test-build       | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 5d4520f31..2e19228ba 100755
--- a/configure
+++ b/configure
@@ -336,7 +336,7 @@ EOQ
 if (prompt_bool $interactive, $question, 0) {
 	my $original_base_dir = $config{BASE_DIR};
 	$config{BASE_DIR} = prompt_dir $interactive, 'In what directory do you wish to install the InspIRCd base?', $config{BASE_DIR};
-	foreach my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_DIR SCRIPT_DIR)) {
+	for my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_DIR SCRIPT_DIR)) {
 		$config{$key} =~ s/^\Q$original_base_dir\E/$config{BASE_DIR}/;
 	}
 	$config{BINARY_DIR} = prompt_dir $interactive, 'In what directory should the InspIRCd binary be placed?', $config{BINARY_DIR};
@@ -357,7 +357,7 @@ Currently, InspIRCd is configured to automatically enable all available extra mo
 Would you like to enable extra modules manually?
 EOQ
 if (prompt_bool $interactive, $question, 0) {
-	foreach my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
+	for my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
 		my $module_name = module_shrink $extra;
 		if (prompt_bool $interactive, "Would you like to enable the <|BOLD $module_name|> module?", 0) {
 			enable_extras $module_name;
diff --git a/make/calcdep.pl b/make/calcdep.pl
index 3c02024fa..ca6b2628c 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -90,7 +90,7 @@ END
 		push @core_deps, $out;
 	}
 
-	foreach my $directory (qw(coremods modules)) {
+	for my $directory (qw(coremods modules)) {
 		opendir(my $moddir, $directory);
 		for my $file (sort readdir $moddir) {
 			next if $file =~ /^\./;
diff --git a/make/configure.pm b/make/configure.pm
index 86ce8d0a1..c044fd104 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -58,7 +58,7 @@ our @EXPORT = qw(CONFIGURE_CACHE_FILE
 
 sub __get_socketengines {
 	my @socketengines;
-	foreach (<${\CONFIGURE_ROOT}/src/socketengines/socketengine_*.cpp>) {
+	for (<${\CONFIGURE_ROOT}/src/socketengines/socketengine_*.cpp>) {
 		s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
 		push @socketengines, $1;
 	}
@@ -261,7 +261,7 @@ sub get_compiler_info($) {
 
 sub find_compiler {
 	my @compilers = qw(c++ g++ clang++ icpc);
-	foreach my $compiler (shift // @compilers) {
+	for my $compiler (shift // @compilers) {
 		return $compiler if __test_compiler $compiler;
 		return "xcrun $compiler" if $^O eq 'darwin' && __test_compiler "xcrun $compiler";
 	}
@@ -276,7 +276,7 @@ sub parse_templates($$$) {
 	my %settings = __get_template_settings($config, $compiler, $version);
 
 	# Iterate through files in make/template.
-	foreach my $template (<${\CONFIGURE_ROOT}/make/template/*>) {
+	for my $template (<${\CONFIGURE_ROOT}/make/template/*>) {
 		say console_format "Parsing <|GREEN ${\abs2rel $template, CONFIGURE_ROOT}|> ...";
 		open(my $fh, $template) or print_error "unable to read $template: $!";
 		my (@lines, $mode, @platforms, @targets);
@@ -343,7 +343,7 @@ sub parse_templates($$$) {
 				# Write the template file.
 				say console_format "Writing <|GREEN ${\abs2rel $target, CONFIGURE_ROOT}|> ...";
 				open(my $fh, '>', $target) or print_error "unable to write $target: $!";
-				foreach (@lines) {
+				for (@lines) {
 					say $fh $_;
 				}
 				close $fh;
diff --git a/make/template/inspircd b/make/template/inspircd
index 4b316e0e0..70072df60 100644
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -149,8 +149,8 @@ sub cmd_help()
 	my @cmds = grep /^cmd_/, @subs;
 	my @devs = grep /^dev_/, @subs;
 	local $_;
-	$_ =~ s/^(cmd|dev)_// foreach (@cmds, @devs);
-	$_ =~ s/_/-/g foreach (@cmds, @devs);
+	$_ =~ s/^(cmd|dev)_// for (@cmds, @devs);
+	$_ =~ s/_/-/g for (@cmds, @devs);
 	print STDERR "Usage: ./inspircd (" . join("|", @cmds) . ")\n";
 	print STDERR "Developer arguments: (" . join("|", @devs) . ")\n";
 	exit GENERIC_EXIT_SUCCESS;
diff --git a/tools/test-build b/tools/test-build
index 47df0c8f0..9312940b6 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -36,7 +36,7 @@ execute 'git', 'clean', '-dfx';
 
 my $root = dirname $RealDir;
 my @compilers = $#ARGV >= 0 ? @ARGV : qw(g++ clang++ icpc);
-foreach my $compiler (@compilers) {
+for my $compiler (@compilers) {
 	if (system "$compiler -v > /dev/null 2>&1") {
 		say "Skipping $compiler as it is not installed on this system!";
 		next;
@@ -46,7 +46,7 @@ foreach my $compiler (@compilers) {
 	push @socketengines, 'epoll' if test_header $compiler, 'sys/epoll.h';
 	push @socketengines, 'kqueue' if test_file $compiler, 'kqueue.cpp';
 	push @socketengines, 'poll' if test_header $compiler, 'poll.h';
-	foreach my $socketengine (@socketengines) {
+	for my $socketengine (@socketengines) {
 		say "Attempting to build using the $compiler compiler and the $socketengine socket engine...";
 		my @configure_flags;
 		if (defined $ENV{TEST_BUILD_MODULES}) {
-- 
2.39.2