summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKefu Chai <kchai@redhat.com>2021-03-10 09:05:32 +0100
committerKefu Chai <kchai@redhat.com>2021-03-10 15:35:25 +0100
commit3b1e8dc8e24069f257a5a8ff13c236047b0d931e (patch)
tree4af03e0f154d38472c938be65472264b9d4470a7
parentcrimson: switch to ceph_le*() constructors (diff)
downloadceph-3b1e8dc8e24069f257a5a8ff13c236047b0d931e.tar.xz
ceph-3b1e8dc8e24069f257a5a8ff13c236047b0d931e.zip
test: use s/init_le*/ceph_le*/
for better readability. Signed-off-by: Kefu Chai <kchai@redhat.com>
-rw-r--r--src/test/common/test_time.cc2
-rw-r--r--src/test/librados/aio.cc2
-rw-r--r--src/test/librados/c_read_operations.cc8
-rw-r--r--src/test/librados/io.cc2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/test/common/test_time.cc b/src/test/common/test_time.cc
index 3054aa50ef7..2ce362b63c1 100644
--- a/src/test/common/test_time.cc
+++ b/src/test/common/test_time.cc
@@ -51,7 +51,7 @@ static constexpr uint32_t bns = 123456789;
static constexpr uint32_t bus = 123456;
static constexpr time_t btt = bs;
static constexpr struct timespec bts = { bs, bns };
-static struct ceph_timespec bcts = { init_le32(bs), init_le32(bns) };
+static struct ceph_timespec bcts = { ceph_le32(bs), ceph_le32(bns) };
static constexpr struct timeval btv = { bs, bus };
static constexpr double bd = bs + ((double)bns / 1000000000.);
diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc
index 2ffff1c342d..8e9662bff52 100644
--- a/src/test/librados/aio.cc
+++ b/src/test/librados/aio.cc
@@ -226,7 +226,7 @@ TEST(LibRadosAio, RoundTrip3) {
rados_read_op_read(op2, 0, sizeof(buf2), buf2, NULL, NULL);
rados_read_op_set_flags(op2, LIBRADOS_OP_FLAG_FADVISE_NOCACHE |
LIBRADOS_OP_FLAG_FADVISE_RANDOM);
- ceph_le32 init_value = init_le32(-1);
+ ceph_le32 init_value(-1);
ceph_le32 checksum[2];
rados_read_op_checksum(op2, LIBRADOS_CHECKSUM_TYPE_CRC32C,
reinterpret_cast<char *>(&init_value),
diff --git a/src/test/librados/c_read_operations.cc b/src/test/librados/c_read_operations.cc
index a6cb3918bf4..4b8336af70a 100644
--- a/src/test/librados/c_read_operations.cc
+++ b/src/test/librados/c_read_operations.cc
@@ -381,7 +381,7 @@ TEST_F(CReadOpsTest, Checksum) {
{
rados_read_op_t op = rados_create_read_op();
- ceph_le64 init_value = init_le64(-1);
+ ceph_le64 init_value(-1);
rados_read_op_checksum(op, LIBRADOS_CHECKSUM_TYPE_XXHASH64,
reinterpret_cast<char *>(&init_value),
sizeof(init_value), 0, len, 0, NULL, 0, NULL);
@@ -390,7 +390,7 @@ TEST_F(CReadOpsTest, Checksum) {
}
{
- ceph_le32 init_value = init_le32(-1);
+ ceph_le32 init_value(-1);
ceph_le32 crc[2];
rados_read_op_t op = rados_create_read_op();
rados_read_op_checksum(op, LIBRADOS_CHECKSUM_TYPE_CRC32C,
@@ -407,7 +407,7 @@ TEST_F(CReadOpsTest, Checksum) {
}
{
- ceph_le32 init_value = init_le32(-1);
+ ceph_le32 init_value(-1);
int rval;
rados_read_op_t op = rados_create_read_op();
rados_read_op_checksum(op, LIBRADOS_CHECKSUM_TYPE_XXHASH32,
@@ -419,7 +419,7 @@ TEST_F(CReadOpsTest, Checksum) {
}
{
- ceph_le32 init_value = init_le32(-1);
+ ceph_le32 init_value(-1);
ceph_le32 crc[3];
int rval;
rados_read_op_t op = rados_create_read_op();
diff --git a/src/test/librados/io.cc b/src/test/librados/io.cc
index 9e801dcd4f4..a60a8737d58 100644
--- a/src/test/librados/io.cc
+++ b/src/test/librados/io.cc
@@ -112,7 +112,7 @@ TEST_F(LibRadosIo, Checksum) {
uint32_t expected_crc = ceph_crc32c(-1, reinterpret_cast<const uint8_t*>(buf),
sizeof(buf));
- ceph_le32 init_value = init_le32(-1);
+ ceph_le32 init_value(-1);
ceph_le32 crc[2];
ASSERT_EQ(0, rados_checksum(ioctx, "foo", LIBRADOS_CHECKSUM_TYPE_CRC32C,
reinterpret_cast<char*>(&init_value),