Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[Epic-ID: ODUHIGH-538] Compilation fix
[o-du/l2.git]
/
src
/
du_app
/
du_cfg.c
diff --git
a/src/du_app/du_cfg.c
b/src/du_app/du_cfg.c
index
eccec22
..
e808132
100644
(file)
--- a/
src/du_app/du_cfg.c
+++ b/
src/du_app/du_cfg.c
@@
-19,12
+19,10
@@
/* This file contains all utility functions */
#include "common_def.h"
/* This file contains all utility functions */
#include "common_def.h"
-#ifdef XML_BASED_CONFIG
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xmlmemory.h>
#include <arpa/inet.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xmlmemory.h>
#include <arpa/inet.h>
-#endif
#include "du_tmr.h"
#include "legtp.h"
#include "du_tmr.h"
#include "legtp.h"
@@
-5475,7
+5473,6
@@
uint8_t parseDuCfgParams(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur)
* ****************************************************************/
uint8_t duReadCfg()
{
* ****************************************************************/
uint8_t duReadCfg()
{
-#ifdef XML_BASED_CONFIG
const char *filename = "../build/config/odu_config.xml";
xmlDocPtr doc = NULLP;
xmlNodePtr cur = NULLP;
const char *filename = "../build/config/odu_config.xml";
xmlDocPtr doc = NULLP;
xmlNodePtr cur = NULLP;
@@
-5489,7
+5486,7
@@
uint8_t duReadCfg()
}
cur = xmlDocGetRootElement(doc);
}
cur = xmlDocGetRootElement(doc);
- ns = xmlSearchNsByHref(doc, cur, (const xmlChar *)"
odu_config.xml
");
+ ns = xmlSearchNsByHref(doc, cur, (const xmlChar *)"
urn:o-ran:odu:configuration
");
if(ns == NULL)
{
DU_LOG("\nERROR --> DU_APP: XML Namespace not found.\n");
if(ns == NULL)
{
DU_LOG("\nERROR --> DU_APP: XML Namespace not found.\n");
@@
-5498,17
+5495,16
@@
uint8_t duReadCfg()
return RFAILED;
}
return RFAILED;
}
+#ifdef XML_BASED_CONFIG
parseDuCfgParams(doc, ns, cur);
parseDuCfgParams(doc, ns, cur);
+#endif
xmlFreeDoc(doc);
xmlCleanupParser();
xmlFreeDoc(doc);
xmlCleanupParser();
-#endif
Pst pst;
Buffer *mBuf;
Pst pst;
Buffer *mBuf;
- memset(&duCfgParam, 0, sizeof(DuCfgParams));
-
/* Read configs into duCfgParams */
if(readCfg() != ROK)
{
/* Read configs into duCfgParams */
if(readCfg() != ROK)
{