[dpkg] 02/02: Dpkg::BuildFlags: Refactor flags initialization by using a single list

[Guillem Jover]

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

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=7a66a1f0b257eab639cfca8d55085c10d8a6219f

commit 7a66a1f0b257eab639cfca8d55085c10d8a6219f (HEAD -> main)
Author: Guillem Jover <guil...@debian.org>
AuthorDate: Fri Sep 1 00:23:28 2023 +0200

    Dpkg::BuildFlags: Refactor flags initialization by using a single list
    
    Instead of open-coding the initialization for the same flag on various
    hashes, use a single list of flag names and then map that into the
    corresponding values.
---
 scripts/Dpkg/BuildFlags.pm | 52 ++++++++++++++--------------------------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index ff5b3eb0e..0df42b4c6 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -73,45 +73,25 @@ sub new {
 sub _init_vendor_defaults {
     my $self = shift;
 
+    my @flags = qw(
+        ASFLAGS
+        CPPFLAGS
+        CFLAGS
+        CXXFLAGS
+        OBJCFLAGS
+        OBJCXXFLAGS
+        DFLAGS
+        FFLAGS
+        FCFLAGS
+        LDFLAGS
+    );
+
     $self->{features} = {};
     $self->{builtins} = {};
     $self->{optvals} = {};
-    $self->{flags} = {
-       ASFLAGS => '',
-       CPPFLAGS => '',
-       CFLAGS   => '',
-       CXXFLAGS => '',
-       OBJCFLAGS   => '',
-       OBJCXXFLAGS => '',
-       DFLAGS   => '',
-       FFLAGS   => '',
-       FCFLAGS  => '',
-       LDFLAGS  => '',
-    };
-    $self->{origin} = {
-       ASFLAGS => 'vendor',
-       CPPFLAGS => 'vendor',
-       CFLAGS   => 'vendor',
-       CXXFLAGS => 'vendor',
-       OBJCFLAGS   => 'vendor',
-       OBJCXXFLAGS => 'vendor',
-       DFLAGS   => 'vendor',
-       FFLAGS   => 'vendor',
-       FCFLAGS  => 'vendor',
-       LDFLAGS  => 'vendor',
-    };
-    $self->{maintainer} = {
-       ASFLAGS => 0,
-       CPPFLAGS => 0,
-       CFLAGS   => 0,
-       CXXFLAGS => 0,
-       OBJCFLAGS   => 0,
-       OBJCXXFLAGS => 0,
-       DFLAGS   => 0,
-       FFLAGS   => 0,
-       FCFLAGS  => 0,
-       LDFLAGS  => 0,
-    };
+    $self->{flags} = { map { $_ => '' } @flags };
+    $self->{origin} = { map { $_ => 'vendor' } @flags };
+    $self->{maintainer} = { map { $_ => 0 } @flags };
 }
 
 =item $bf->load_vendor_defaults()

-- 
Dpkg.Org's dpkg