From 7dd0667d46bc32f9180a0bb381d1eef7cab2a947 Mon Sep 17 00:00:00 2001
From: Avra Sengupta <asengupt@redhat.com>
Date: Wed, 5 Aug 2015 15:56:53 +0530
Subject: snapshot: Fix snapshot info's xml output

    Backport of http://review.gluster.org/#/c/11834/

Display description field with (null) if
no description is present for the snapshot, instead
of removing the field altogether.

Change-Id: I965b08cd6e54eea56c32e2712fab7daa8a663f11
BUG: 1250388
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/11918
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
---
 cli/src/cli-xml-output.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'cli')

diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
index 9960635de8c..fcbc72d51eb 100644
--- a/cli/src/cli-xml-output.c
+++ b/cli/src/cli-xml-output.c
@@ -4467,8 +4467,12 @@ cli_xml_snapshot_info_per_snap (xmlTextWriterPtr writer, xmlDocPtr doc,
                 ret = xmlTextWriterWriteFormatElement (writer,
                                                 (xmlChar *) "description",
                                                 "%s", buffer);
-                XML_RET_CHECK_AND_GOTO (ret, out);
+        } else {
+                ret = xmlTextWriterWriteFormatElement (writer,
+                                                (xmlChar *) "description",
+                                                "%s", "");
         }
+        XML_RET_CHECK_AND_GOTO (ret, out);
 
         snprintf (key_buffer, sizeof (key_buffer), "%s.snap-time", keyprefix);
 
-- 
cgit