- added const

diff --git a/client/snbk/GlobalOptions.h b/client/snbk/GlobalOptions.h
index 6147c26818bf5433dd7db0ea54f8a61f08b1f5ca..d72f42a52c2e96f68f36e1ae170445ffe84a01d0 100644 (file)
--- a/client/snbk/GlobalOptions.h
+++ b/client/snbk/GlobalOptions.h
@@ -50,7 +50,7 @@ namespace snapper
        bool quiet() const { return _quiet; }
        bool verbose() const { return _verbose; }
        bool debug() const { return _debug; }
-       const boost::optional<BackupConfig::TargetMode>& target_mode() { return _target_mode; }
+       const boost::optional<BackupConfig::TargetMode>& target_mode() const { return _target_mode; }
        bool automatic() const { return _automatic; }
        bool utc() const { return _utc; }
        bool iso() const { return _iso; }

diff --git a/client/snbk/cmd-delete.cc b/client/snbk/cmd-delete.cc
index e51ca7bbfe7371197137517baf68f8bd04ff30db..84475cba125e26626bdaf98c6d0a18ef932f99ec 100644 (file)
--- a/client/snbk/cmd-delete.cc
+++ b/client/snbk/cmd-delete.cc
@@ -90,7 +90,7 @@ namespace snapper
 
 
     void
-    command_delete(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_delete(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                   ProxySnappers* snappers)
     {
        SnapshotDelete snapshot_operation(global_options, get_opts, backup_configs,

diff --git a/client/snbk/cmd-list-configs.cc b/client/snbk/cmd-list-configs.cc
index 9106ee83cc75b4dedd342426d4cc7e4dbf465c6f..bdd6da55f172c71cc6ea86d6e8b89104d9452356 100644 (file)
--- a/client/snbk/cmd-list-configs.cc
+++ b/client/snbk/cmd-list-configs.cc
@@ -279,7 +279,7 @@ namespace snapper
 
 
     void
-    command_list_configs(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_list_configs(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                         ProxySnappers* snappers)
     {
        ParsedOpts opts = get_opts.parse("list-configs", GetOpts::no_options);

diff --git a/client/snbk/cmd-list.cc b/client/snbk/cmd-list.cc
index f6760f644015128207422029136622537812c0e4..2923627e53f1106a538df3213f7b101b210b51f1 100644 (file)
--- a/client/snbk/cmd-list.cc
+++ b/client/snbk/cmd-list.cc
@@ -354,7 +354,7 @@ namespace snapper
 
 
     void
-    command_list(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_list(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                 ProxySnappers* snappers)
     {
        ParsedOpts opts = get_opts.parse("list", GetOpts::no_options);

diff --git a/client/snbk/cmd-restore.cc b/client/snbk/cmd-restore.cc
index 74452b772b6fe445afd849f51391da67fa8d54db..ffb97e527c28a1766bc6eb15b7a61833418b99be 100644 (file)
--- a/client/snbk/cmd-restore.cc
+++ b/client/snbk/cmd-restore.cc
@@ -106,7 +106,7 @@ namespace snapper
 
     void
     command_restore(const GlobalOptions& global_options, GetOpts& get_opts,
-                   BackupConfigs& backup_configs, ProxySnappers* snappers)
+                   const BackupConfigs& backup_configs, ProxySnappers* snappers)
     {
        SnapshotRestore snapshot_operation(global_options, get_opts, backup_configs,
                                           snappers);

diff --git a/client/snbk/cmd-transfer-and-delete.cc b/client/snbk/cmd-transfer-and-delete.cc
index 64927b9aba54eb27dd99df128bfc2b42ee3abe0f..1b76f1c3dc1424737a91d89900c4e753e134e3f4 100644 (file)
--- a/client/snbk/cmd-transfer-and-delete.cc
+++ b/client/snbk/cmd-transfer-and-delete.cc
@@ -106,8 +106,8 @@ namespace snapper
 
 
     void
-    command_transfer_and_delete(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
-                               ProxySnappers* snappers)
+    command_transfer_and_delete(const GlobalOptions& global_options, GetOpts& get_opts,
+                               const BackupConfigs& backup_configs, ProxySnappers* snappers)
     {
        SnapshotTransferAndDelete snapshot_operation(global_options, get_opts,
                                                     backup_configs, snappers);

diff --git a/client/snbk/cmd-transfer.cc b/client/snbk/cmd-transfer.cc
index facd8a67e37c7ef4f1780074b280248d4a19c499..578c8a0073cb5d424c40e695ff25bd049b62bd37 100644 (file)
--- a/client/snbk/cmd-transfer.cc
+++ b/client/snbk/cmd-transfer.cc
@@ -90,7 +90,7 @@ namespace snapper
 
 
     void
-    command_transfer(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_transfer(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                     ProxySnappers* snappers)
     {
        SnapshotTransfer snapshot_operation(global_options, get_opts, backup_configs,

diff --git a/client/snbk/cmd-visualize.cc b/client/snbk/cmd-visualize.cc
index b3e6af66eec60df017394204d782a41f58cdd727..16f2ba3f60b6da8cbdf151954658ce367ff022c9 100644 (file)
--- a/client/snbk/cmd-visualize.cc
+++ b/client/snbk/cmd-visualize.cc
@@ -79,7 +79,7 @@ namespace snapper
     }
 
     void command_visualize(const GlobalOptions& global_options, GetOpts& get_opts,
-                           BackupConfigs& backup_configs, ProxySnappers* snappers)
+                           const BackupConfigs& backup_configs, ProxySnappers* snappers)
     {
        // Drawing a graph for multiple backup configs is not supported.
        if (backup_configs.size() != 1)
@@ -88,7 +88,7 @@ namespace snapper
                                        "command.")));
        }
 
-       BackupConfig& backup_config = backup_configs.front();
+       const BackupConfig& backup_config = backup_configs.front();
 
        // Check and parse arguments
        const vector<Option> options = { Option("rankdir", required_argument, 'r') };

diff --git a/client/snbk/cmd.h b/client/snbk/cmd.h
index a4b0451a2797737c832d4e87a1da0bbbe0f8710d..9f6ae793944027b3fbfb0a88b78e0f918f2e55ab 100644 (file)
--- a/client/snbk/cmd.h
+++ b/client/snbk/cmd.h
@@ -33,7 +33,7 @@ namespace snapper
     help_list_configs();
 
     void
-    command_list_configs(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_list_configs(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                         ProxySnappers* snappers);
 
 
@@ -41,7 +41,7 @@ namespace snapper
     help_list();
 
     void
-    command_list(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_list(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                 ProxySnappers* snappers);
 
 
@@ -49,7 +49,7 @@ namespace snapper
     help_transfer();
 
     void
-    command_transfer(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_transfer(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                     ProxySnappers* snappers);
 
 
@@ -57,7 +57,7 @@ namespace snapper
     help_restore();
 
     void
-    command_restore(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_restore(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                     ProxySnappers* snappers);
 
 
@@ -65,7 +65,7 @@ namespace snapper
     help_delete();
 
     void
-    command_delete(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
+    command_delete(const GlobalOptions& global_options, GetOpts& get_opts, const BackupConfigs& backup_configs,
                   ProxySnappers* snappers);
 
 
@@ -73,13 +73,13 @@ namespace snapper
     help_transfer_and_delete();
 
     void
-    command_transfer_and_delete(const GlobalOptions& global_options, GetOpts& get_opts, BackupConfigs& backup_configs,
-                               ProxySnappers* snappers);
+    command_transfer_and_delete(const GlobalOptions& global_options, GetOpts& get_opts,
+                               const BackupConfigs& backup_configs, ProxySnappers* snappers);
 
 
     void help_visualize();
 
     void command_visualize(const GlobalOptions& global_options, GetOpts& get_opts,
-                           BackupConfigs& backup_configs, ProxySnappers* snappers);
+                           const BackupConfigs& backup_configs, ProxySnappers* snappers);
 
 }

diff --git a/client/snbk/snbk.cc b/client/snbk/snbk.cc
index 7a70f60f9fa42ff4e031a2169706883f2fc42643..423c9c936b6bb8006bdf0aafff5fd6c0dc69a5a4 100644 (file)
--- a/client/snbk/snbk.cc
+++ b/client/snbk/snbk.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2024-2025] SUSE LLC
+ * Copyright (c) [2024-2026] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -42,10 +42,10 @@ using namespace snapper;
 
 struct Cmd
 {
-    typedef void (*cmd_func_t)(const GlobalOptions& global_options, GetOpts& get_opts,
-                              BackupConfigs& backup_configs, ProxySnappers* snappers);
+    using cmd_func_t = void (*)(const GlobalOptions& global_options, GetOpts& get_opts,
+                               const BackupConfigs& backup_configs, ProxySnappers* snappers);
 
-    typedef void (*help_func_t)();
+    using help_func_t = void (*)();
 
     Cmd(const string& name, cmd_func_t cmd_func, help_func_t help_func, bool needs_snapper)
        : name(name), cmd_func(cmd_func), help_func(help_func), needs_snapper(needs_snapper)
@@ -91,7 +91,7 @@ help(const vector<Cmd>& cmds, GetOpts& get_opts)
 
 
 vector<string>
-get_backup_configs(const GlobalOptions& global_options, const Cmd* cmd)
+get_backup_config_names(const GlobalOptions& global_options, const Cmd* cmd)
 {
     if (cmd->name == "list-configs")
        return read_backup_config_names();
@@ -107,6 +107,29 @@ get_backup_configs(const GlobalOptions& global_options, const Cmd* cmd)
 }
 
 
+BackupConfigs
+get_backup_configs(const GlobalOptions& global_options, const vector<string>& names)
+{
+    BackupConfigs backup_configs;
+
+    for (const string& name : names)
+    {
+       BackupConfig backup_config(name);
+
+       if (global_options.target_mode() &&
+           backup_config.target_mode != global_options.target_mode().value())
+           continue;
+
+       if (global_options.automatic() && !backup_config.automatic)
+           continue;
+
+       backup_configs.push_back(backup_config);
+    }
+
+    return backup_configs;
+}
+
+
 int
 main(int argc, char** argv)
 {
@@ -173,23 +196,8 @@ main(int argc, char** argv)
 
        try
        {
-           const vector<string> names = get_backup_configs(global_options, &*cmd);
-
-           BackupConfigs backup_configs;
-
-           for (const string& name : names)
-           {
-               BackupConfig backup_config(name);
-
-               if (global_options.target_mode() &&
-                   backup_config.target_mode != global_options.target_mode().value())
-                   continue;
-
-               if (global_options.automatic() && !backup_config.automatic)
-                   continue;
-
-               backup_configs.push_back(backup_config);
-           }
+           const vector<string> names = get_backup_config_names(global_options, &*cmd);
+           const BackupConfigs backup_configs = get_backup_configs(global_options, names);
 
            unique_ptr<ProxySnappers> snappers;