From acfe128f38eaef0df32bc23e060fe3dba124e2b5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 10 Mar 2021 16:09:13 +0800 Subject: [PATCH] cls/rgw, rgw: use s/init_le*/ceph_le*/ for better readability. Signed-off-by: Kefu Chai --- src/cls/rgw/cls_rgw_types.cc | 4 ++-- src/cls/rgw/cls_rgw_types.h | 2 +- src/rgw/rgw_dencoder.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cls/rgw/cls_rgw_types.cc b/src/cls/rgw/cls_rgw_types.cc index 2e306fe7e84..247d9c00bcc 100644 --- a/src/cls/rgw/cls_rgw_types.cc +++ b/src/cls/rgw/cls_rgw_types.cc @@ -552,7 +552,7 @@ void rgw_bi_log_entry::generate_test_instances(list& ls) ls.push_back(new rgw_bi_log_entry); ls.back()->id = "midf"; ls.back()->object = "obj"; - ls.back()->timestamp = ceph::real_clock::from_ceph_timespec({init_le32(2), init_le32(3)}); + ls.back()->timestamp = ceph::real_clock::from_ceph_timespec({ceph_le32(2), ceph_le32(3)}); ls.back()->index_ver = 4323; ls.back()->tag = "tagasdfds"; ls.back()->op = CLS_RGW_OP_DEL; @@ -730,7 +730,7 @@ void cls_rgw_reshard_entry::generate_test_instances(list { ls.push_back(new cls_rgw_reshard_entry); ls.push_back(new cls_rgw_reshard_entry); - ls.back()->time = ceph::real_clock::from_ceph_timespec({init_le32(2), init_le32(3)}); + ls.back()->time = ceph::real_clock::from_ceph_timespec({ceph_le32(2), ceph_le32(3)}); ls.back()->tenant = "tenant"; ls.back()->bucket_name = "bucket1"""; ls.back()->bucket_id = "bucket_id"; diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h index 434feceeed3..19303120a75 100644 --- a/src/cls/rgw/cls_rgw_types.h +++ b/src/cls/rgw/cls_rgw_types.h @@ -1174,7 +1174,7 @@ struct cls_rgw_gc_obj_info ls.push_back(new cls_rgw_gc_obj_info); ls.push_back(new cls_rgw_gc_obj_info); ls.back()->tag = "footag"; - ceph_timespec ts{init_le32(21), init_le32(32)}; + ceph_timespec ts{ceph_le32(21), ceph_le32(32)}; ls.back()->time = ceph::real_clock::from_ceph_timespec(ts); } }; diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc index 612d6d1e8b7..ea68dac22e1 100644 --- a/src/rgw/rgw_dencoder.cc +++ b/src/rgw/rgw_dencoder.cc @@ -593,7 +593,7 @@ void RGWBucketEntryPoint::generate_test_instances(list& o) RGWBucketEntryPoint *bp = new RGWBucketEntryPoint(); init_bucket(&bp->bucket, "tenant", "bucket", "pool", ".index.pool", "marker", "10"); bp->owner = "owner"; - bp->creation_time = ceph::real_clock::from_ceph_timespec({init_le32(2), init_le32(3)}); + bp->creation_time = ceph::real_clock::from_ceph_timespec({ceph_le32(2), ceph_le32(3)}); o.push_back(bp); o.push_back(new RGWBucketEntryPoint); -- 2.39.5