]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
Remove unused CmdChecksum module
authorCheng-Ling Lai <jameslai.tech@gmail.com>
Thu, 30 Jul 2026 02:51:10 +0000 (10:51 +0800)
committerCheng-Ling Lai <jameslai.tech@gmail.com>
Mon, 3 Aug 2026 01:12:17 +0000 (09:12 +0800)
client/snbk/BackupConfig.cc
client/snbk/BackupConfig.h
client/snbk/CmdChecksum.cc [deleted file]
client/snbk/CmdChecksum.h [deleted file]
client/snbk/Makefile.am
configure.ac

index ab72d390ea6585ae089c933bbbcc18b2991e1f59..cd3119584166b497919f45429902d853fa4ec771 100644 (file)
@@ -77,7 +77,6 @@ namespace snapper
        get_child_value(json_file.get_root(), "target-mkdir-bin", target_mkdir_bin);
        get_child_value(json_file.get_root(), "target-rm-bin", target_rm_bin);
        get_child_value(json_file.get_root(), "target-rmdir-bin", target_rmdir_bin);
-       get_child_value(json_file.get_root(), "target-sha256sum-bin", target_sha256sum_bin);
     }
 
 
index ce37075b2af0b7db832e824ea25b2334bed1f226..44cc55b3578cc1e8f0a77c151b514038eaaa1e19 100644 (file)
@@ -80,7 +80,6 @@ namespace snapper
        string target_mkdir_bin = MKDIR_BIN;
        string target_rm_bin = RM_BIN;
        string target_rmdir_bin = RMDIR_BIN;
-       string target_sha256sum_bin = SHA256SUM_BIN;
 
     private:
 
diff --git a/client/snbk/CmdChecksum.cc b/client/snbk/CmdChecksum.cc
deleted file mode 100644 (file)
index 7237d87..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2026 SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact Novell, Inc.
- *
- * To contact Novell about this file by physical or electronic mail, you may
- * find current contact information at www.novell.com.
- */
-
-
-#include <boost/algorithm/string.hpp>
-
-#include <snapper/AppUtil.h>
-#include <snapper/Exception.h>
-#include <snapper/LoggerImpl.h>
-#include <snapper/SystemCmd.h>
-
-#include "../utils/text.h"
-
-#include "CmdChecksum.h"
-
-
-namespace snapper
-{
-
-    CmdChecksum::CmdChecksum(const Shell& shell, const string& chksum_bin, const string& path)
-       : path(path)
-    {
-       SystemCmd::Args cmd_args = { chksum_bin, "--", path };
-       SystemCmd cmd(shellify(shell, cmd_args));
-
-       if (cmd.retcode() != 0)
-       {
-           y2err("command '" << cmd.cmd() << "' failed: " << cmd.retcode());
-           for (const string& tmp : cmd.get_stdout())
-               y2err(tmp);
-           for (const string& tmp : cmd.get_stderr())
-               y2err(tmp);
-
-           SN_THROW(Exception(_("Failed to compute checksum.")));
-       }
-
-       parse(cmd.get_stdout());
-
-       y2mil(*this);
-    }
-
-
-    void
-    CmdChecksum::parse(const vector<string>& lines)
-    {
-       if (lines.size() != 1)
-           SN_THROW(Exception(_("Invalid number of lines in checksum output.")));
-
-       vector<string> parts;
-       boost::split(parts, lines[0], boost::is_any_of(" "), boost::token_compress_on);
-       if (parts.size() != 2)
-       {
-           y2err("Invalid checksum line: " << lines[0]);
-           SN_THROW(Exception(_("Invalid checksum output format.")));
-       }
-
-       checksum = parts[0];
-    }
-
-
-    std::ostream&
-    operator<<(std::ostream& s, const CmdChecksum& cmd_checksum)
-    {
-       s << "path: " << cmd_checksum.path << " checksum: " << cmd_checksum.checksum << '\n';
-
-       return s;
-    }
-
-
-} // namespace snapper
diff --git a/client/snbk/CmdChecksum.h b/client/snbk/CmdChecksum.h
deleted file mode 100644 (file)
index 4cfc08e..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2026 SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact Novell, Inc.
- *
- * To contact Novell about this file by physical or electronic mail, you may
- * find current contact information at www.novell.com.
- */
-
-
-#ifndef SNAPPER_CMD_CHECKSUM_H
-#define SNAPPER_CMD_CHECKSUM_H
-
-
-#include "Shell.h"
-
-
-namespace snapper
-{
-    using std::string;
-
-
-    /**
-     * Get the checksum (e.g. sha256sum) of the file at the given path.
-     */
-    class CmdChecksum
-    {
-    public:
-
-       CmdChecksum(const Shell& shell, const string& checksum_bin, const string& path);
-
-       const string& get_checksum() const { return checksum; }
-
-       friend std::ostream& operator<<(std::ostream& s, const CmdChecksum& cmd_checksum);
-
-    private:
-
-       void parse(const vector<string>& lines);
-
-       const string path;
-       string checksum;
-
-    };
-
-
-} // namespace snapper
-
-
-#endif
index 1523820109d45e4c75d7aab05e4ac80cf28a7ebc..b92a8709246ce4eded9ddf8250337cf12f6efc9f 100644 (file)
@@ -23,7 +23,6 @@ snbk_SOURCES =                                                \
        Shell.cc                Shell.h                 \
        CmdBtrfs.cc             CmdBtrfs.h              \
        CmdLs.cc                CmdLs.h                 \
-       CmdChecksum.cc          CmdChecksum.h           \
        CmdMetaParse.cc         CmdMetaParse.h          \
        JsonFile.cc             JsonFile.h              \
        utils.cc                utils.h                 \
index 130d2eed0216632573abb1bf4081c03b73839403..8db1c9c3ea69c90089b4ed02ddad57a6fa2ecb8b 100644 (file)
@@ -42,7 +42,6 @@ AC_PATH_PROG([LVS_BIN], [lvs], [/sbin/lvs])
 AC_PATH_PROG([MKDIR_BIN], [mkdir], [/bin/mkdir])
 AC_PATH_PROG([RM_BIN], [rm], [/bin/rm])
 AC_PATH_PROG([RMDIR_BIN], [rmdir], [/bin/rmdir])
-AC_PATH_PROG([SHA256SUM_BIN], [sha256sum], [/usr/bin/sha256sum])
 AC_PATH_PROG([TOUCH_BIN], [touch], [/usr/bin/touch])
 
 AC_DEFINE_UNQUOTED([BTRFS_BIN], ["$BTRFS_BIN"], [Path of btrfs program.])
@@ -61,7 +60,6 @@ AC_DEFINE_UNQUOTED([LVS_BIN], ["$LVS_BIN"], [Path of lvs program.])
 AC_DEFINE_UNQUOTED([MKDIR_BIN], ["$MKDIR_BIN"], [Path of mkdir program.])
 AC_DEFINE_UNQUOTED([RM_BIN], ["$RM_BIN"], [Path of rm program.])
 AC_DEFINE_UNQUOTED([RMDIR_BIN], ["$RMDIR_BIN"], [Path of rmdir program.])
-AC_DEFINE_UNQUOTED([SHA256SUM_BIN], ["$SHA256SUM_BIN"], [Path of sha256sum program.])
 AC_DEFINE_UNQUOTED([TOUCH_BIN], ["$TOUCH_BIN"], [Path of touch program.])
 
 CFLAGS="${CFLAGS} -std=c99 -Wall -Wextra -Wformat -Wmissing-prototypes -Wno-unused-parameter"