From: Signed-off-by: Eric Lee <eric.lee@hgst.com>
Date: Wed, 9 Mar 2016 13:28:32 +0000 (-0500)
Subject: test/librgw_file_*: use size_t* for rgw_read arg
X-Git-Tag: v10.1.0~162^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f42b86b2638ebcf4ddb9dd1b90b5e75466f5b586;p=ceph.git

test/librgw_file_*: use size_t* for rgw_read arg

Fixes 32-bit build.

Signed-off-by: Eric Lee <eric.lee@hgst.com>
---

diff --git a/src/test/librgw_file_aw.cc b/src/test/librgw_file_aw.cc
index 5284cc77b9a..2ae73b88c93 100644
--- a/src/test/librgw_file_aw.cc
+++ b/src/test/librgw_file_aw.cc
@@ -230,7 +230,7 @@ TEST(LibRGW, OPEN2) {
 }
 
 TEST(LibRGW, GET_OBJECT) {
-  uint64_t nread;
+  size_t nread;
   off_t offset = 0;
   struct iovec *iovs = zp_set1.get_iovs();
   for (int ix : {2 , 3}) {
diff --git a/src/test/librgw_file_gp.cc b/src/test/librgw_file_gp.cc
index 06b199b218f..ec70b5da65c 100644
--- a/src/test/librgw_file_gp.cc
+++ b/src/test/librgw_file_gp.cc
@@ -248,7 +248,7 @@ TEST(LibRGW, GET_OBJECT) {
   if (do_get) {
     char sbuf[512];
     memset(sbuf, 0, 512);
-    uint64_t nread;
+    size_t nread;
     int ret = rgw_read(fs, object_fh, 0 /* off */, 512 /* len */, &nread, sbuf,
 		       RGW_READ_FLAG_NONE);
     ASSERT_EQ(ret, 0);
diff --git a/src/test/librgw_file_nfsns.cc b/src/test/librgw_file_nfsns.cc
index b7ab964c269..49f0ff5afc8 100644
--- a/src/test/librgw_file_nfsns.cc
+++ b/src/test/librgw_file_nfsns.cc
@@ -513,7 +513,7 @@ TEST(LibRGW, READ_DIRS1)
   if (do_dirs1) {
     int rc;
     char buf[256];
-    uint64_t nread;
+    size_t nread;
     for (auto& dirs_rec : dirs_vec) {
       obj_rec& dir = get<0>(dirs_rec);
       if (verbose) {
@@ -583,7 +583,7 @@ TEST(LibRGW, READF_DIRS1) {
       uint64_t offset = 0;
       uint64_t length = bufsz;
       for (int ix = 0; ix < 6; ++ix) {
-	uint64_t nread = 0;
+	size_t nread = 0;
 	memset(buffer, 0, length); // XXX
 	rc = rgw_read(fs, fobj.fh, offset, length, &nread, buffer,
 		      RGW_READ_FLAG_NONE);
@@ -635,7 +635,7 @@ TEST(LibRGW, WRITEF_DIRS1) {
       for (int ix = 0; ix < 6; ++ix) {
 	ASSERT_TRUE(ifs.good());
 	ifs.read(buffer, bufsz);
-	uint64_t nwritten = 0;
+	size_t nwritten = 0;
 	string str;
 	str.assign(buffer, 4);
 	if (verbose) {