From: Sage Weil <sage.weil@dreamhost.com>
Date: Tue, 24 May 2011 17:00:23 +0000 (-0700)
Subject: librados: len should be size_t
X-Git-Tag: v0.29~42^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=297026852104920d1aa7fdfd9b77daebaa839c85;p=ceph.git

librados: len should be size_t

Unsigned, and size_t because it's a buffer size.

Fixes signedness warning in testrados.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index fdf14e98850..0bae0187c54 100644
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -153,7 +153,7 @@ int rados_rmxattr(rados_ioctx_t io, const char *o, const char *name);
 
 int rados_getxattrs(rados_ioctx_t io, const char *oid, rados_xattrs_iter_t *iter);
 int rados_getxattrs_next(rados_xattrs_iter_t iter, const char **name,
-			 const char **val, int *len);
+			 const char **val, size_t *len);
 void rados_getxattrs_end(rados_xattrs_iter_t iter);
 
 /* misc */
diff --git a/src/librados.cc b/src/librados.cc
index 8348900ee5e..21550dd516f 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -3279,7 +3279,7 @@ extern "C" int rados_getxattrs(rados_ioctx_t io, const char *oid,
 }
 
 extern "C" int rados_getxattrs_next(rados_xattrs_iter_t iter,
-				    const char **name, const char **val, int *len)
+				    const char **name, const char **val, size_t *len)
 {
   RadosXattrsIter *it = (RadosXattrsIter*)iter;
   if (it->i == it->attrset.end()) {
diff --git a/src/testrados.c b/src/testrados.c
index 5f8345bcc6e..27942c5d704 100644
--- a/src/testrados.c
+++ b/src/testrados.c
@@ -52,7 +52,7 @@ static void do_rados_getxattrs(rados_ioctx_t io_ctx, const char *oid,
 			const char **exkeys, const char **exvals)
 {
 	rados_xattrs_iter_t iter;
-	int len, nval = 0, i, nfound = 0, ret = 0;
+	int nval = 0, i, nfound = 0, ret = 0;
 
 	for (i = 0; exvals[i]; ++i) {
 		++nval;
@@ -63,7 +63,8 @@ static void do_rados_getxattrs(rados_ioctx_t io_ctx, const char *oid,
 		exit(1);
 	}
 	while (1) {
-		const char *key, *val;
+	        size_t len;
+	        const char *key, *val;
 		ret = rados_getxattrs_next(iter, &key, &val, &len);
 		if (ret) {
 			printf("rados_getxattrs(%s): rados_getxattrs_next "