From 2023347961b8afede8db9334c9f37b5d7ea6dddf Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Wed, 6 Feb 2013 10:22:01 +0100
Subject: [PATCH] Improve tools

---
 tools/lpc2xml.c |  3 +++
 tools/xml2lpc.c | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tools/lpc2xml.c b/tools/lpc2xml.c
index 9ff7f39d2..39fd62b0e 100644
--- a/tools/lpc2xml.c
+++ b/tools/lpc2xml.c
@@ -98,6 +98,8 @@ static int processEntry(const char *section, const char *entry, xmlNode *node, l
 		lpc2xml_log(ctx->ctx, LPC2XML_ERROR, "Issue when reading the lpc");
 		return -1;
 	}
+	
+	lpc2xml_log(ctx, LPC2XML_MESSAGE, "Set %s|%s = %s", section, entry, content);
 	xmlNodeSetContent(node, (const xmlChar *) content);
 	return 0;
 }
@@ -123,6 +125,7 @@ static void processSection_cb(const char *entry, struct __processSectionCtx *ctx
 			ctx->ret = -1;
 			return;
 		}
+	
 		ctx->ret = processEntry(ctx->section, entry, node, ctx->ctx);
 	}
 }
diff --git a/tools/xml2lpc.c b/tools/xml2lpc.c
index 9d720f1f3..c9a5c94e2 100644
--- a/tools/xml2lpc.c
+++ b/tools/xml2lpc.c
@@ -148,7 +148,7 @@ static int processEntry(xmlElement *element, const char *sectionName, xml2lpc_co
 	if(name != NULL) {
 		const char *str = lp_config_get_string(ctx->lpc, sectionName, name, NULL);
 		if(str == NULL || overwrite) {
-			xml2lpc_log(ctx, XML2LPC_MESSAGE, "Set %s|%s = %s",sectionName, name, value);
+			xml2lpc_log(ctx, XML2LPC_MESSAGE, "Set %s|%s = %s", sectionName, name, value);
 			lp_config_set_string(ctx->lpc, sectionName, name, value);
 		} else {
 			xml2lpc_log(ctx, XML2LPC_MESSAGE, "Don't touch %s|%s = %s",sectionName, name, str);
@@ -231,8 +231,10 @@ int xml2lpc_validate(xml2lpc_context *xmlCtx) {
 	xmlSchemaSetValidErrors(validCtx, xml2lpc_genericxml_error, xml2lpc_genericxml_warning, xmlCtx);
 	int ret =  xmlSchemaValidateDoc(validCtx, xmlCtx->doc);
 	if(ret > 0) {
-		xml2lpc_log(xmlCtx, XML2LPC_WARNING, "%s", xmlCtx->warningBuffer);
-		xml2lpc_log(xmlCtx, XML2LPC_ERROR, "%s", xmlCtx->errorBuffer);
+		if(strlen(xmlCtx->warningBuffer) > 0)
+			xml2lpc_log(xmlCtx, XML2LPC_WARNING, "%s", xmlCtx->warningBuffer);
+		if(strlen(xmlCtx->errorBuffer) > 0)
+			xml2lpc_log(xmlCtx, XML2LPC_ERROR, "%s", xmlCtx->errorBuffer);
 	} else if(ret < 0) {
 		xml2lpc_log(xmlCtx, XML2LPC_ERROR, "Internal error");
 	}
@@ -242,6 +244,13 @@ int xml2lpc_validate(xml2lpc_context *xmlCtx) {
 
 int xml2lpc_convert(xml2lpc_context *xmlCtx, LpConfig *lpc) {
 	xml2lpc_context_clear_logs(xmlCtx);
+	if(xmlCtx->doc == NULL) {
+		xml2lpc_log(xmlCtx, XML2LPC_ERROR, "No doc set");
+		return -1;
+	}
+	if(lpc == NULL) {
+		xml2lpc_log(xmlCtx, XML2LPC_ERROR, "Invalid lpc");
+	}
 	xmlCtx->lpc = lpc;
 	return internal_convert_xml2lpc(xmlCtx);
 }