From: Dan Mick <dan.mick@inktank.com>
Date: Sat, 29 Mar 2014 01:10:43 +0000 (-0700)
Subject: rbd.cc: yes, cover formatted output as well.  sigh.
X-Git-Tag: v0.67.10~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d474443b12b978dbe267e63cd8e34e8c835e4f6c;p=ceph.git

rbd.cc: yes, cover formatted output as well.  sigh.

Fixes: #7577
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit bd6e35c1b171e46cc3e026c59b076b73440a8502)
---

diff --git a/src/rbd.cc b/src/rbd.cc
index 293a6a1c8f72..daf7571a035b 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -505,6 +505,10 @@ static int do_show_info(const char *imgname, librbd::Image& image,
       return r;
   }
 
+  char prefix[RBD_MAX_BLOCK_NAME_SIZE + 1];
+  strncpy(prefix, info.block_name_prefix, RBD_MAX_BLOCK_NAME_SIZE);
+  prefix[RBD_MAX_BLOCK_NAME_SIZE] = '\0';
+
   if (f) {
     f->open_object_section("image");
     f->dump_string("name", imgname);
@@ -512,12 +516,9 @@ static int do_show_info(const char *imgname, librbd::Image& image,
     f->dump_unsigned("objects", info.num_objs);
     f->dump_int("order", info.order);
     f->dump_unsigned("object_size", info.obj_size);
-    f->dump_string("block_name_prefix", info.block_name_prefix);
+    f->dump_string("block_name_prefix", prefix);
     f->dump_int("format", (old_format ? 1 : 2));
   } else {
-    char prefix[RBD_MAX_BLOCK_NAME_SIZE + 1];
-    strncpy(prefix, info.block_name_prefix, RBD_MAX_BLOCK_NAME_SIZE);
-    prefix[RBD_MAX_BLOCK_NAME_SIZE] = '\0';
     cout << "rbd image '" << imgname << "':\n"
 	 << "\tsize " << prettybyte_t(info.size) << " in "
 	 << info.num_objs << " objects"