facet::factory: Use facet_info::name for facet::get_name to avoid duplication

18 files changed, 37 insertions, 70 deletions

diff --git a/lib/sbuild/chroot/facet/block-device.cc b/lib/sbuild/chroot/facet/block-device.cc
index 166e33d0..8d07d95e 100644
--- a/lib/sbuild/chroot/facet/block-device.cc
+++ b/lib/sbuild/chroot/facet/block-device.cc
@@ -48,7 +48,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info block_device_info =
+        const factory::facet_info block_device_info =
           {
             "block-device",
             N_("Support for ‘block-device’ chroots"),
@@ -99,9 +99,7 @@ namespace sbuild
       std::string const&
       block_device::get_name () const
       {
-        static const std::string name("block-device");
-
-        return name;
+        return block_device_info.name;
       }
 
       block_device::ptr
diff --git a/lib/sbuild/chroot/facet/btrfs-snapshot.cc b/lib/sbuild/chroot/facet/btrfs-snapshot.cc
index 170da0ca..7bcb6f57 100644
--- a/lib/sbuild/chroot/facet/btrfs-snapshot.cc
+++ b/lib/sbuild/chroot/facet/btrfs-snapshot.cc
@@ -45,7 +45,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info btrfs_snapshot_info =
+        const factory::facet_info btrfs_snapshot_info =
           {
             "btrfs-snapshot",
             N_("Support for ‘btrfs-snapshot’ chroots"),
@@ -93,9 +93,7 @@ namespace sbuild
       std::string const&
       btrfs_snapshot::get_name () const
       {
-        static const std::string name("btrfs-snapshot");
-
-        return name;
+        return btrfs_snapshot_info.name;
       }
 
       btrfs_snapshot::ptr
diff --git a/lib/sbuild/chroot/facet/custom.cc b/lib/sbuild/chroot/facet/custom.cc
index 9bccd220..55c41068 100644
--- a/lib/sbuild/chroot/facet/custom.cc
+++ b/lib/sbuild/chroot/facet/custom.cc
@@ -44,7 +44,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info custom_info =
+        const factory::facet_info custom_info =
           {
             "custom",
             N_("Support for ‘custom’ chroots"),
@@ -85,9 +85,7 @@ namespace sbuild
       std::string const&
       custom::get_name () const
       {
-        static const std::string name("custom");
-
-        return name;
+        return custom_info.name;
       }
 
       custom::ptr
diff --git a/lib/sbuild/chroot/facet/directory.cc b/lib/sbuild/chroot/facet/directory.cc
index 90bd5b66..2e48f632 100644
--- a/lib/sbuild/chroot/facet/directory.cc
+++ b/lib/sbuild/chroot/facet/directory.cc
@@ -44,7 +44,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info directory_info =
+        const factory::facet_info directory_info =
           {
             "directory",
             N_("Support for ‘directory’ chroots"),
@@ -96,9 +96,7 @@ namespace sbuild
       std::string const&
       directory::get_name () const
       {
-        static const std::string name("directory");
-
-        return name;
+        return directory_info.name;
       }
 
       directory::ptr
diff --git a/lib/sbuild/chroot/facet/file.cc b/lib/sbuild/chroot/facet/file.cc
index 3f45746c..9f26f566 100644
--- a/lib/sbuild/chroot/facet/file.cc
+++ b/lib/sbuild/chroot/facet/file.cc
@@ -44,7 +44,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info file_info =
+        const factory::facet_info file_info =
           {
             "file",
             N_("Support for ‘file’ chroots"),
@@ -92,9 +92,7 @@ namespace sbuild
       std::string const&
       file::get_name () const
       {
-        static const std::string name("file");
-
-        return name;
+        return file_info.name;
       }
 
       file::ptr
diff --git a/lib/sbuild/chroot/facet/fsunion.cc b/lib/sbuild/chroot/facet/fsunion.cc
index 3db40e5b..c0acc4c7 100644
--- a/lib/sbuild/chroot/facet/fsunion.cc
+++ b/lib/sbuild/chroot/facet/fsunion.cc
@@ -43,9 +43,9 @@ namespace sbuild
 
         feature feature_union("UNION", N_("Support for filesystem unioning"));
 
-        factory::facet_info fsunion_info =
+        const factory::facet_info fsunion_info =
           {
-            "union",
+            "filesystem-union",
             N_("Support for filesystem unioning"),
             false,
             []() -> facet::ptr { return fsunion::create(); }
@@ -92,9 +92,7 @@ namespace sbuild
       std::string const&
       fsunion::get_name () const
       {
-        static const std::string name("union");
-
-        return name;
+        return fsunion_info.name;
       }
 
       bool
diff --git a/lib/sbuild/chroot/facet/loopback.cc b/lib/sbuild/chroot/facet/loopback.cc
index 73a7a96d..4f52e113 100644
--- a/lib/sbuild/chroot/facet/loopback.cc
+++ b/lib/sbuild/chroot/facet/loopback.cc
@@ -44,7 +44,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info loopback_info =
+        const factory::facet_info loopback_info =
           {
             "loopback",
             N_("Support for ‘loopback’ chroots"),
@@ -93,9 +93,7 @@ namespace sbuild
       std::string const&
       loopback::get_name () const
       {
-        static const std::string name("loopback");
-
-        return name;
+        return loopback_info.name;
       }
 
       loopback::ptr
diff --git a/lib/sbuild/chroot/facet/lvm-snapshot.cc b/lib/sbuild/chroot/facet/lvm-snapshot.cc
index 113f3d69..d7772a9a 100644
--- a/lib/sbuild/chroot/facet/lvm-snapshot.cc
+++ b/lib/sbuild/chroot/facet/lvm-snapshot.cc
@@ -44,7 +44,8 @@ namespace sbuild
 
       namespace
       {
-        factory::facet_info lvm_snapshot_info =
+
+        const factory::facet_info lvm_snapshot_info =
           {
             "lvm-snapshot",
             N_("Support for ‘lvm-snapshot’ chroots"),
@@ -90,9 +91,7 @@ namespace sbuild
       std::string const&
       lvm_snapshot::get_name () const
       {
-        static const std::string name("lvm-snapshot");
-
-        return name;
+        return lvm_snapshot_info.name;
       }
 
       lvm_snapshot::ptr
diff --git a/lib/sbuild/chroot/facet/mountable.cc b/lib/sbuild/chroot/facet/mountable.cc
index fce24281..223cb8bc 100644
--- a/lib/sbuild/chroot/facet/mountable.cc
+++ b/lib/sbuild/chroot/facet/mountable.cc
@@ -40,7 +40,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info mountable_info =
+        const factory::facet_info mountable_info =
           {
             "mountable",
             N_("Support for filesystem mounting"),
@@ -79,9 +79,7 @@ namespace sbuild
       std::string const&
       mountable::get_name () const
       {
-        static const std::string name("mountable");
-
-        return name;
+        return mountable_info.name;
       }
 
       std::string const&
diff --git a/lib/sbuild/chroot/facet/personality.cc b/lib/sbuild/chroot/facet/personality.cc
index 0936ad34..bcf62c1d 100644
--- a/lib/sbuild/chroot/facet/personality.cc
+++ b/lib/sbuild/chroot/facet/personality.cc
@@ -36,7 +36,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info personality_info =
+        const factory::facet_info personality_info =
           {
             "personality",
             N_("Linux kernel Application Binary Interface switching"),
@@ -73,9 +73,7 @@ namespace sbuild
       std::string const&
       personality::get_name () const
       {
-        static const std::string name("personality");
-
-        return name;
+        return personality_info.name;
       }
 
       sbuild::personality const&
diff --git a/lib/sbuild/chroot/facet/plain.cc b/lib/sbuild/chroot/facet/plain.cc
index b8cc9eae..880853a0 100644
--- a/lib/sbuild/chroot/facet/plain.cc
+++ b/lib/sbuild/chroot/facet/plain.cc
@@ -42,7 +42,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info plain_info =
+        const factory::facet_info plain_info =
           {
             "plain",
             N_("Support for ‘plain’ chroots"),
@@ -71,9 +71,7 @@ namespace sbuild
       std::string const&
       plain::get_name () const
       {
-        static const std::string name("plain");
-
-        return name;
+        return plain_info.name;
       }
 
       plain::ptr
diff --git a/lib/sbuild/chroot/facet/session-clonable.cc b/lib/sbuild/chroot/facet/session-clonable.cc
index 35924385..deee34e5 100644
--- a/lib/sbuild/chroot/facet/session-clonable.cc
+++ b/lib/sbuild/chroot/facet/session-clonable.cc
@@ -44,7 +44,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info session_clonable_info =
+        const factory::facet_info session_clonable_info =
           {
             "session-clonable",
             N_("Support for session chroot cloning"),
@@ -80,9 +80,7 @@ namespace sbuild
       std::string const&
       session_clonable::get_name () const
       {
-        static const std::string name("session-clonable");
-
-        return name;
+        return session_clonable_info.name;
       }
 
       chroot::ptr
diff --git a/lib/sbuild/chroot/facet/session.cc b/lib/sbuild/chroot/facet/session.cc
index e45dbf39..7a8a8dc6 100644
--- a/lib/sbuild/chroot/facet/session.cc
+++ b/lib/sbuild/chroot/facet/session.cc
@@ -48,7 +48,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info session_info =
+        const factory::facet_info session_info =
           {
             "session",
             N_("Support for session chroots"),
@@ -86,9 +86,7 @@ namespace sbuild
       std::string const&
       session::get_name () const
       {
-        static const std::string name("session");
-
-        return name;
+        return session_info.name;
       }
 
       std::string const&
diff --git a/lib/sbuild/chroot/facet/source-clonable.cc b/lib/sbuild/chroot/facet/source-clonable.cc
index 7f3f5716..149c9c8a 100644
--- a/lib/sbuild/chroot/facet/source-clonable.cc
+++ b/lib/sbuild/chroot/facet/source-clonable.cc
@@ -42,7 +42,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info source_clonable_info =
+        const factory::facet_info source_clonable_info =
           {
             "source-clonable",
             N_("Support for source chroot cloning"),
@@ -83,9 +83,7 @@ namespace sbuild
       std::string const&
       source_clonable::get_name () const
       {
-        static const std::string name("source-clonable");
-
-        return name;
+        return source_clonable_info.name;
       }
 
       bool
diff --git a/lib/sbuild/chroot/facet/source.cc b/lib/sbuild/chroot/facet/source.cc
index e5ade412..ef2d947e 100644
--- a/lib/sbuild/chroot/facet/source.cc
+++ b/lib/sbuild/chroot/facet/source.cc
@@ -37,7 +37,7 @@ namespace sbuild
       namespace
       {
 
-        factory::facet_info source_info =
+        const factory::facet_info source_info =
           {
             "source",
             N_("Support for source chroots"),
@@ -73,9 +73,7 @@ namespace sbuild
       std::string const&
       source::get_name () const
       {
-        static const std::string name("source");
-
-        return name;
+        return source_info.name;
       }
 
     }
diff --git a/lib/sbuild/chroot/facet/unshare.cc b/lib/sbuild/chroot/facet/unshare.cc
index 8c3e2328..24b441f8 100644
--- a/lib/sbuild/chroot/facet/unshare.cc
+++ b/lib/sbuild/chroot/facet/unshare.cc
@@ -45,7 +45,7 @@ namespace sbuild
         ("UNSHARE",
          N_("Linux dissassociation of shared execution context"));
 
-        factory::facet_info unshare_info =
+        const factory::facet_info unshare_info =
           {
             "unshare",
             N_("Linux dissassociation of shared execution context"),
@@ -94,9 +94,7 @@ namespace sbuild
       std::string const&
       unshare::get_name () const
       {
-        static const std::string name("unshare");
-
-        return name;
+        return unshare_info.name;
       }
 
       bool
diff --git a/lib/sbuild/chroot/facet/userdata.cc b/lib/sbuild/chroot/facet/userdata.cc
index 95182ecd..7c91700e 100644
--- a/lib/sbuild/chroot/facet/userdata.cc
+++ b/lib/sbuild/chroot/facet/userdata.cc
@@ -73,7 +73,7 @@ namespace sbuild
           return ret;
         }
 
-        factory::facet_info userdata_info =
+        const factory::facet_info userdata_info =
           {
             "userdata",
             N_("User setting of custom configuration parameters"),
@@ -130,9 +130,7 @@ namespace sbuild
       std::string const&
       userdata::get_name () const
       {
-        static const std::string name("userdata");
-
-        return name;
+        return userdata_info.name;
       }
 
       void
diff --git a/test/sbuild/chroot/chroot.cc b/test/sbuild/chroot/chroot.cc
index 03b0bf5b..374bcdf0 100644
--- a/test/sbuild/chroot/chroot.cc
+++ b/test/sbuild/chroot/chroot.cc
@@ -105,7 +105,7 @@ public:
 namespace
 {
 
-  sbuild::chroot::facet::factory::facet_info test_info =
+  const sbuild::chroot::facet::factory::facet_info test_info =
     {
       "test",
       "Support for ‘test’ chroots",