From: Kefu Chai <kchai@redhat.com>
Date: Sat, 16 Apr 2016 18:47:36 +0000 (+0800)
Subject: librados: always set the outstrlen for rados_ping_monitor()
X-Git-Tag: v11.0.0~784^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8cfb69c920c679f53d43c0437dd11927633bd40;p=ceph.git

librados: always set the outstrlen for rados_ping_monitor()

should set outstrlen even if the returned payload is empty. and we do
handle the empty string in do_out_buffer().

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index 05dfac509f71..096f0d765488 100644
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -2966,7 +2966,7 @@ extern "C" int rados_ping_monitor(rados_t cluster, const char *mon_id,
   }
 
   int ret = client->ping_monitor(mon_id, &str);
-  if (ret == 0 && !str.empty() && outstr && outstrlen) {
+  if (ret == 0) {
     do_out_buffer(str, outstr, outstrlen);
   }
   tracepoint(librados, rados_ping_monitor_exit, ret, ret < 0 ? NULL : outstr, ret < 0 ? NULL : outstrlen);