From a17257727ce00b25ea88800c0dd54deec4d999ba Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Wed, 5 Aug 2015 16:36:06 +0530 Subject: xml output: Fix non-uniform opErrstr xml output Backport of http://review.gluster.org/#/c/11835/ Display in case of no operrstr for all xml output of gluster commands Change-Id: Ie16f749f90b4642357c562012408c434cd38661f BUG: 1218732 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/11921 Tested-by: Gluster Build System Reviewed-by: Raghavendra Bhat Reviewed-by: mohammed rafi kc --- cli/src/cli-xml-output.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cli/src/cli-xml-output.c') diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index 922711dc2be..2ff924158ce 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: -- cgit