tools/ceph_dedup: Replace iterator loops with range-based loops

Refactor the code to use modern C++ range-based for loops instead of
traditional iterator-based loops, improving code readability

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/src/tools/ceph_dedup/ceph_dedup_daemon.cc b/src/tools/ceph_dedup/ceph_dedup_daemon.cc
index a3571ccb4a428dca274824a9593122566ac7d271..45b67fc201cbecd845e807f3a437aec1b1e53cb8 100644 (file)
--- a/src/tools/ceph_dedup/ceph_dedup_daemon.cc
+++ b/src/tools/ceph_dedup/ceph_dedup_daemon.cc
@@ -365,11 +365,9 @@ void SampleDedupWorkerThread::crawl()
        op.list_snaps(&snap_set, &snap_ret);
        io_ctx.operate(target.oid, &op, NULL);
 
-       for (std::vector<librados::clone_info_t>::const_iterator r = snap_set.clones.begin();
-         r != snap_set.clones.end();
-         ++r) {
-         io_ctx.snap_set_read(r->cloneid);
-         try_dedup_and_accumulate_result(target, r->cloneid);
+       for (const auto& clone : snap_set.clones) {
+         io_ctx.snap_set_read(clone.cloneid);
+         try_dedup_and_accumulate_result(target, clone.cloneid);
        }
       } else {
        try_dedup_and_accumulate_result(target);

diff --git a/src/tools/ceph_dedup/ceph_dedup_tool.cc b/src/tools/ceph_dedup/ceph_dedup_tool.cc
index fc8aa44fa92c9c2783140e7aa82885945d87f8bc..31a4eb8f8bdfea7df369a4a6407809efc5cdfee5 100644 (file)
--- a/src/tools/ceph_dedup/ceph_dedup_tool.cc
+++ b/src/tools/ceph_dedup/ceph_dedup_tool.cc
@@ -1040,10 +1040,8 @@ int make_dedup_object(const po::variables_map &opts)
       op.list_snaps(&snap_set, &snap_ret);
       io_ctx.operate(object_name, &op, NULL);
 
-      for (std::vector<librados::clone_info_t>::const_iterator r = snap_set.clones.begin();
-       r != snap_set.clones.end();
-       ++r) {
-       io_ctx.snap_set_read(r->cloneid);
+      for (const auto& clone : snap_set.clones) {
+       io_ctx.snap_set_read(clone.cloneid);
        ret = create_new_deduped_object(object_name);
        if (ret < 0) {
          goto out;