From f7cd20ace4dc09f02de5720157684ed85cd94ee2 Mon Sep 17 00:00:00 2001
From: Avra Sengupta <asengupt@redhat.com>
Date: Wed, 5 Aug 2015 16:36:06 +0530
Subject: [PATCH 277/279] xml output: Fix non-uniform opErrstr xml output

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

Display <opErrstr/> in case of no operrstr for
all xml output of gluster commands.

Change-Id: Ie16f749f90b4642357c562012408c434cd38661f
BUG: 1245897
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/11920
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/55411
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
---
 cli/src/cli-xml-output.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
index d41aebc..b558a9a 100644
--- a/cli/src/cli-xml-output.c
+++ b/cli/src/cli-xml-output.c
@@ -123,8 +123,15 @@ cli_xml_output_common (xmlTextWriterPtr writer, int op_ret, int op_errno,
                                                "%d", op_errno);
         XML_RET_CHECK_AND_GOTO (ret, out);
 
-        ret = xmlTextWriterWriteFormatElement (writer, (xmlChar *)"opErrstr",
-                                                "%s", op_errstr);
+        if (op_errstr)
+                ret = xmlTextWriterWriteFormatElement (writer,
+                                                       (xmlChar *)"opErrstr",
+                                                       "%s", op_errstr);
+        else
+                ret = xmlTextWriterWriteFormatElement (writer,
+                                                       (xmlChar *)"opErrstr",
+                                                       "%s", "");
+
         XML_RET_CHECK_AND_GOTO (ret, out);
 
 out:
-- 
1.7.1