aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2025-01-03 14:56:36 -05:00
Code

Update: Corrected symbol names

Browse Source
This commit is contained in:
Philipp Schafft 2018-11-09 14:15:30 +00:00
parent 4473ed367f
commit 110bba709f
2 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
include/igloo/reportxml.h
View File

@ -74,7 +74,7 @@ typedef enum {
/* This gets the root node of a report XML document */ /* This gets the root node of a report XML document */
igloo_reportxml_node_t * reportxml_get_root_node(igloo_reportxml_t *report); igloo_reportxml_node_t * igloo_reportxml_get_root_node(igloo_reportxml_t *report);
/* This selects a node by an attribute and it's value. /* This selects a node by an attribute and it's value.
* This is mostly useful to look for an object by using it's ID. * This is mostly useful to look for an object by using it's ID.
* If more than one node matches the first one found is returned. * If more than one node matches the first one found is returned.
@ -82,13 +82,13 @@ igloo_reportxml_node_t * reportxml_get_root_node(igloo_reportxml_t *report)
* <definition> are also considered. If it is false nodes inside * <definition> are also considered. If it is false nodes inside
* <definition>s are skipped. * <definition>s are skipped.
*/ */
igloo_reportxml_node_t * reportxml_get_node_by_attribute(igloo_reportxml_t *report, const char *key, const char *value, int include_definitions); igloo_reportxml_node_t * igloo_reportxml_get_node_by_attribute(igloo_reportxml_t *report, const char *key, const char *value, int include_definitions);
/* This gets a node by it's type. Otherwise identical to reportxml_get_node_by_attribute() */ /* This gets a node by it's type. Otherwise identical to igloo_reportxml_get_node_by_attribute() */
igloo_reportxml_node_t * reportxml_get_node_by_type(igloo_reportxml_t *report, reportxml_node_type_t type, int include_definitions); igloo_reportxml_node_t * igloo_reportxml_get_node_by_type(igloo_reportxml_t *report, reportxml_node_type_t type, int include_definitions);
/* This function parses an XML document and returns the parst report XML document */ /* This function parses an XML document and returns the parst report XML document */
igloo_reportxml_t * reportxml_parse_xmldoc(xmlDocPtr doc); igloo_reportxml_t * igloo_reportxml_parse_xmldoc(xmlDocPtr doc);
/* This function renders an report XML document as XML structure */ /* This function renders an report XML document as XML structure */
xmlDocPtr reportxml_render_xmldoc(igloo_reportxml_t *report); xmlDocPtr igloo_reportxml_render_xmldoc(igloo_reportxml_t *report);
/* ---[ Node level ]--- */ /* ---[ Node level ]--- */
@ -98,33 +98,33 @@ xmlDocPtr reportxml_render_xmldoc(igloo_reportxml_t *report);
/* This creates a new node of type type. /* This creates a new node of type type.
* It's id, definition, and akindof attributes can be given as parameters. * It's id, definition, and akindof attributes can be given as parameters.
*/ */
igloo_reportxml_node_t * reportxml_node_new(reportxml_node_type_t type, const char *id, const char *definition, const char *akindof); igloo_reportxml_node_t * igloo_reportxml_node_new(reportxml_node_type_t type, const char *id, const char *definition, const char *akindof);
/* This parses an XML node and returns the resulting report XML node */ /* This parses an XML node and returns the resulting report XML node */
igloo_reportxml_node_t * reportxml_node_parse_xmlnode(xmlNodePtr xmlnode); igloo_reportxml_node_t * igloo_reportxml_node_parse_xmlnode(xmlNodePtr xmlnode);
/* Copy an report XML node (and it's children) */ /* Copy an report XML node (and it's children) */
igloo_reportxml_node_t * reportxml_node_copy(igloo_reportxml_node_t *node); igloo_reportxml_node_t * igloo_reportxml_node_copy(igloo_reportxml_node_t *node);
/* Renders an report XML node as XML node */ /* Renders an report XML node as XML node */
xmlNodePtr reportxml_node_render_xmlnode(igloo_reportxml_node_t *node); xmlNodePtr igloo_reportxml_node_render_xmlnode(igloo_reportxml_node_t *node);
/* This gets the type of an report XML node */ /* This gets the type of an report XML node */
reportxml_node_type_t reportxml_node_get_type(igloo_reportxml_node_t *node); reportxml_node_type_t igloo_reportxml_node_get_type(igloo_reportxml_node_t *node);
/* Gets and Sets attribute values */ /* Gets and Sets attribute values */
int reportxml_node_set_attribute(igloo_reportxml_node_t *node, const char *key, const char *value); int igloo_reportxml_node_set_attribute(igloo_reportxml_node_t *node, const char *key, const char *value);
char * reportxml_node_get_attribute(igloo_reportxml_node_t *node, const char *key); char * igloo_reportxml_node_get_attribute(igloo_reportxml_node_t *node, const char *key);
/* Adds, counts, and get child nodes */ /* Adds, counts, and get child nodes */
int reportxml_node_add_child(igloo_reportxml_node_t *node, igloo_reportxml_node_t *child); int igloo_reportxml_node_add_child(igloo_reportxml_node_t *node, igloo_reportxml_node_t *child);
ssize_t reportxml_node_count_child(igloo_reportxml_node_t *node); ssize_t igloo_reportxml_node_count_child(igloo_reportxml_node_t *node);
igloo_reportxml_node_t * reportxml_node_get_child(igloo_reportxml_node_t *node, size_t idx); igloo_reportxml_node_t * igloo_reportxml_node_get_child(igloo_reportxml_node_t *node, size_t idx);
/* This gets an child by it's value of the given attribute. See reportxml_get_node_by_attribute() for more details. */ /* This gets an child by it's value of the given attribute. See igloo_reportxml_get_node_by_attribute() for more details. */
igloo_reportxml_node_t * reportxml_node_get_child_by_attribute(igloo_reportxml_node_t *node, const char *key, const char *value, int include_definitions); igloo_reportxml_node_t * igloo_reportxml_node_get_child_by_attribute(igloo_reportxml_node_t *node, const char *key, const char *value, int include_definitions);
/* This gets a child by it's type. Otherwise identical to reportxml_node_get_child_by_attribute() */ /* This gets a child by it's type. Otherwise identical to igloo_reportxml_node_get_child_by_attribute() */
igloo_reportxml_node_t * reportxml_node_get_child_by_type(igloo_reportxml_node_t *node, reportxml_node_type_t type, int include_definitions); igloo_reportxml_node_t * igloo_reportxml_node_get_child_by_type(igloo_reportxml_node_t *node, reportxml_node_type_t type, int include_definitions);
/* This gets and sets the text content of an node (used for <text>) */ /* This gets and sets the text content of an node (used for <text>) */
int reportxml_node_set_content(igloo_reportxml_node_t *node, const char *value); int igloo_reportxml_node_set_content(igloo_reportxml_node_t *node, const char *value);
char * reportxml_node_get_content(igloo_reportxml_node_t *node); char * igloo_reportxml_node_get_content(igloo_reportxml_node_t *node);
/* Adds, counts, and gets XML childs (used for <extension>) */ /* Adds, counts, and gets XML childs (used for <extension>) */
int reportxml_node_add_xml_child(igloo_reportxml_node_t *node, xmlNodePtr child); int igloo_reportxml_node_add_xml_child(igloo_reportxml_node_t *node, xmlNodePtr child);
ssize_t reportxml_node_count_xml_child(igloo_reportxml_node_t *node); ssize_t igloo_reportxml_node_count_xml_child(igloo_reportxml_node_t *node);
xmlNodePtr reportxml_node_get_xml_child(igloo_reportxml_node_t *node, size_t idx); xmlNodePtr igloo_reportxml_node_get_xml_child(igloo_reportxml_node_t *node, size_t idx);
/* ---[ Database level ]--- */ /* ---[ Database level ]--- */
@ -132,14 +132,14 @@ xmlNodePtr reportxml_node_get_xml_child(igloo_reportxml_node_t *nod
/* Add an report to the database */ /* Add an report to the database */
int reportxml_database_add_report(igloo_reportxml_database_t *db, igloo_reportxml_t *report); int igloo_reportxml_database_add_report(igloo_reportxml_database_t *db, igloo_reportxml_t *report);
/* Build a node (copy) from the data in the database based on the given ID (using "definition" and "defines" attributes) /* Build a node (copy) from the data in the database based on the given ID (using "definition" and "defines" attributes)
* depth may be used to select how many recursions may be used to resolve definitions within defines. * depth may be used to select how many recursions may be used to resolve definitions within defines.
* The default value is selected by passing -1 (recommended). * The default value is selected by passing -1 (recommended).
*/ */
igloo_reportxml_node_t * reportxml_database_build_node(igloo_reportxml_database_t *db, const char *id, ssize_t depth); igloo_reportxml_node_t * igloo_reportxml_database_build_node(igloo_reportxml_database_t *db, const char *id, ssize_t depth);
/* This does the same as reportxml_database_build_node() except that a new report document is returned. */ /* This does the same as igloo_reportxml_database_build_node() except that a new report document is returned. */
igloo_reportxml_t * reportxml_database_build_report(igloo_reportxml_database_t *db, const char *id, ssize_t depth); igloo_reportxml_t * igloo_reportxml_database_build_report(igloo_reportxml_database_t *db, const char *id, ssize_t depth);
#ifdef __cplusplus #ifdef __cplusplus
} }

176
src/reportxml.c
View File

@ -253,7 +253,7 @@ static void __report_free(igloo_ro_t self)
static int __report_new(igloo_ro_t self, const igloo_ro_type_t *type, va_list ap) static int __report_new(igloo_ro_t self, const igloo_ro_type_t *type, va_list ap)
{ {
igloo_reportxml_t *ret = igloo_RO_TO_TYPE(self, igloo_reportxml_t); igloo_reportxml_t *ret = igloo_RO_TO_TYPE(self, igloo_reportxml_t);
igloo_reportxml_node_t *root = reportxml_node_new(REPORTXML_NODE_TYPE_REPORT, NULL, NULL, NULL); igloo_reportxml_node_t *root = igloo_reportxml_node_new(REPORTXML_NODE_TYPE_REPORT, NULL, NULL, NULL);
if (!root) if (!root)
return -1; return -1;
@ -279,7 +279,7 @@ static igloo_reportxml_t * reportxml_new_with_root(igloo_reportxml_node_t *ro
return ret; return ret;
} }
igloo_reportxml_node_t * reportxml_get_root_node(igloo_reportxml_t *report) igloo_reportxml_node_t * igloo_reportxml_get_root_node(igloo_reportxml_t *report)
{ {
if (!report) if (!report)
return NULL; return NULL;
@ -290,23 +290,23 @@ igloo_reportxml_node_t * reportxml_get_root_node(igloo_reportxml_t *report)
return report->root; return report->root;
} }
igloo_reportxml_node_t * reportxml_get_node_by_attribute(igloo_reportxml_t *report, const char *key, const char *value, int include_definitions) igloo_reportxml_node_t * igloo_reportxml_get_node_by_attribute(igloo_reportxml_t *report, const char *key, const char *value, int include_definitions)
{ {
if (!report || !key || !value) if (!report || !key || !value)
return NULL; return NULL;
return reportxml_node_get_child_by_attribute(report->root, key, value, include_definitions); return igloo_reportxml_node_get_child_by_attribute(report->root, key, value, include_definitions);
} }
igloo_reportxml_node_t * reportxml_get_node_by_type(igloo_reportxml_t *report, reportxml_node_type_t type, int include_definitions) igloo_reportxml_node_t * igloo_reportxml_get_node_by_type(igloo_reportxml_t *report, reportxml_node_type_t type, int include_definitions)
{ {
if (!report) if (!report)
return NULL; return NULL;
return reportxml_node_get_child_by_type(report->root, type, include_definitions); return igloo_reportxml_node_get_child_by_type(report->root, type, include_definitions);
} }
igloo_reportxml_t * reportxml_parse_xmldoc(xmlDocPtr doc) igloo_reportxml_t * igloo_reportxml_parse_xmldoc(xmlDocPtr doc)
{ {
igloo_reportxml_node_t *root; igloo_reportxml_node_t *root;
igloo_reportxml_t *ret; igloo_reportxml_t *ret;
@ -319,11 +319,11 @@ igloo_reportxml_t * reportxml_parse_xmldoc(xmlDocPtr doc)
if (!xmlroot) if (!xmlroot)
return NULL; return NULL;
root = reportxml_node_parse_xmlnode(xmlroot); root = igloo_reportxml_node_parse_xmlnode(xmlroot);
if (!root) if (!root)
return NULL; return NULL;
if (reportxml_node_get_type(root) != REPORTXML_NODE_TYPE_REPORT) { if (igloo_reportxml_node_get_type(root) != REPORTXML_NODE_TYPE_REPORT) {
igloo_ro_unref(root); igloo_ro_unref(root);
return NULL; return NULL;
} }
@ -337,7 +337,7 @@ igloo_reportxml_t * reportxml_parse_xmldoc(xmlDocPtr doc)
return ret; return ret;
} }
xmlDocPtr reportxml_render_xmldoc(igloo_reportxml_t *report) xmlDocPtr igloo_reportxml_render_xmldoc(igloo_reportxml_t *report)
{ {
xmlDocPtr ret; xmlDocPtr ret;
xmlNodePtr node; xmlNodePtr node;
@ -345,7 +345,7 @@ xmlDocPtr reportxml_render_xmldoc(igloo_reportxml_t *report)
if (!report) if (!report)
return NULL; return NULL;
node = reportxml_node_render_xmlnode(report->root); node = igloo_reportxml_node_render_xmlnode(report->root);
if (!node) if (!node)
return NULL; return NULL;
@ -380,7 +380,7 @@ static void __report_node_free(igloo_ro_t self)
free(node->xml_childs); free(node->xml_childs);
} }
igloo_reportxml_node_t * reportxml_node_new(reportxml_node_type_t type, const char *id, const char *definition, const char *akindof) igloo_reportxml_node_t * igloo_reportxml_node_new(reportxml_node_type_t type, const char *id, const char *definition, const char *akindof)
{ {
igloo_reportxml_node_t *ret; igloo_reportxml_node_t *ret;
const struct nodedef *nodedef = __get_nodedef(type); const struct nodedef *nodedef = __get_nodedef(type);
@ -409,7 +409,7 @@ igloo_reportxml_node_t * reportxml_node_new(reportxml_node_type_t type, con
break; break;
if (nodeattr->def) { if (nodeattr->def) {
if (reportxml_node_set_attribute(ret, nodeattr->name, nodeattr->def) != 0) { if (igloo_reportxml_node_set_attribute(ret, nodeattr->name, nodeattr->def) != 0) {
igloo_ro_unref(ret); igloo_ro_unref(ret);
return NULL; return NULL;
} }
@ -418,7 +418,7 @@ igloo_reportxml_node_t * reportxml_node_new(reportxml_node_type_t type, con
#define _set_attr(x) \ #define _set_attr(x) \
if ((x)) { \ if ((x)) { \
if (reportxml_node_set_attribute(ret, # x , (x)) != 0) { \ if (igloo_reportxml_node_set_attribute(ret, # x , (x)) != 0) { \
igloo_ro_unref(ret); \ igloo_ro_unref(ret); \
return NULL; \ return NULL; \
} \ } \
@ -431,7 +431,7 @@ igloo_reportxml_node_t * reportxml_node_new(reportxml_node_type_t type, con
return ret; return ret;
} }
igloo_reportxml_node_t * reportxml_node_parse_xmlnode(xmlNodePtr xmlnode) igloo_reportxml_node_t * igloo_reportxml_node_parse_xmlnode(xmlNodePtr xmlnode)
{ {
igloo_reportxml_node_t *node; igloo_reportxml_node_t *node;
@ -445,7 +445,7 @@ igloo_reportxml_node_t * reportxml_node_parse_xmlnode(xmlNodePtr xmlnode)
return NULL; return NULL;
} }
node = reportxml_node_new(nodedef->type, NULL, NULL, NULL); node = igloo_reportxml_node_new(nodedef->type, NULL, NULL, NULL);
if (!node) if (!node)
return NULL; return NULL;
@ -459,7 +459,7 @@ igloo_reportxml_node_t * reportxml_node_parse_xmlnode(xmlNodePtr xmlnode)
return NULL; return NULL;
} }
if (reportxml_node_set_attribute(node, (const char*)cur->name, (const char*)value) != 0) { if (igloo_reportxml_node_set_attribute(node, (const char*)cur->name, (const char*)value) != 0) {
igloo_ro_unref(node); igloo_ro_unref(node);
return NULL; return NULL;
} }
@ -473,7 +473,7 @@ igloo_reportxml_node_t * reportxml_node_parse_xmlnode(xmlNodePtr xmlnode)
do { do {
if (nodedef->content == NC_XML) { if (nodedef->content == NC_XML) {
if (reportxml_node_add_xml_child(node, cur) != 0) { if (igloo_reportxml_node_add_xml_child(node, cur) != 0) {
igloo_ro_unref(node); igloo_ro_unref(node);
return NULL; return NULL;
} }
@ -494,7 +494,7 @@ igloo_reportxml_node_t * reportxml_node_parse_xmlnode(xmlNodePtr xmlnode)
return NULL; return NULL;
} }
if (reportxml_node_set_content(node, (const char *)value) != 0) { if (igloo_reportxml_node_set_content(node, (const char *)value) != 0) {
igloo_ro_unref(node); igloo_ro_unref(node);
return NULL; return NULL;
} }
@ -503,13 +503,13 @@ igloo_reportxml_node_t * reportxml_node_parse_xmlnode(xmlNodePtr xmlnode)
continue; continue;
} }
child = reportxml_node_parse_xmlnode(cur); child = igloo_reportxml_node_parse_xmlnode(cur);
if (!child) { if (!child) {
igloo_ro_unref(node); igloo_ro_unref(node);
return NULL; return NULL;
} }
if (reportxml_node_add_child(node, child) != 0) { if (igloo_reportxml_node_add_child(node, child) != 0) {
igloo_ro_unref(child); igloo_ro_unref(child);
igloo_ro_unref(node); igloo_ro_unref(node);
return NULL; return NULL;
@ -532,27 +532,27 @@ static igloo_reportxml_node_t * __reportxml_node_copy_with_db(igloo_reportx
if (!node) if (!node)
return NULL; return NULL;
child_count = reportxml_node_count_child(node); child_count = igloo_reportxml_node_count_child(node);
if (child_count < 0) if (child_count < 0)
return NULL; return NULL;
xml_child_count = reportxml_node_count_xml_child(node); xml_child_count = igloo_reportxml_node_count_xml_child(node);
if (xml_child_count < 0) if (xml_child_count < 0)
return NULL; return NULL;
ret = reportxml_node_parse_xmlnode(node->xmlnode); ret = igloo_reportxml_node_parse_xmlnode(node->xmlnode);
if (!ret) if (!ret)
return NULL; return NULL;
if (node->content) { if (node->content) {
if (reportxml_node_set_content(ret, node->content) != 0) { if (igloo_reportxml_node_set_content(ret, node->content) != 0) {
igloo_ro_unref(ret); igloo_ro_unref(ret);
return NULL; return NULL;
} }
} }
for (i = 0; i < (size_t)child_count; i++) { for (i = 0; i < (size_t)child_count; i++) {
igloo_reportxml_node_t *child = reportxml_node_get_child(node, i); igloo_reportxml_node_t *child = igloo_reportxml_node_get_child(node, i);
if (db && depth > 0) { if (db && depth > 0) {
if (__attach_copy_of_node_or_definition(ret, child, db, depth) != 0) { if (__attach_copy_of_node_or_definition(ret, child, db, depth) != 0) {
@ -571,7 +571,7 @@ static igloo_reportxml_node_t * __reportxml_node_copy_with_db(igloo_reportx
return NULL; return NULL;
} }
if (reportxml_node_add_child(ret, copy) != 0) { if (igloo_reportxml_node_add_child(ret, copy) != 0) {
igloo_ro_unref(copy); igloo_ro_unref(copy);
igloo_ro_unref(ret); igloo_ro_unref(ret);
return NULL; return NULL;
@ -582,8 +582,8 @@ static igloo_reportxml_node_t * __reportxml_node_copy_with_db(igloo_reportx
} }
for (i = 0; i < (size_t)xml_child_count; i++) { for (i = 0; i < (size_t)xml_child_count; i++) {
xmlNodePtr child = reportxml_node_get_xml_child(node, i); xmlNodePtr child = igloo_reportxml_node_get_xml_child(node, i);
if (reportxml_node_add_xml_child(ret, child) != 0) { if (igloo_reportxml_node_add_xml_child(ret, child) != 0) {
xmlFreeNode(child); xmlFreeNode(child);
igloo_ro_unref(ret); igloo_ro_unref(ret);
return NULL; return NULL;
@ -594,12 +594,12 @@ static igloo_reportxml_node_t * __reportxml_node_copy_with_db(igloo_reportx
return ret; return ret;
} }
igloo_reportxml_node_t * reportxml_node_copy(igloo_reportxml_node_t *node) igloo_reportxml_node_t * igloo_reportxml_node_copy(igloo_reportxml_node_t *node)
{ {
return __reportxml_node_copy_with_db(node, NULL, -1); return __reportxml_node_copy_with_db(node, NULL, -1);
} }
xmlNodePtr reportxml_node_render_xmlnode(igloo_reportxml_node_t *node) xmlNodePtr igloo_reportxml_node_render_xmlnode(igloo_reportxml_node_t *node)
{ {
xmlNodePtr ret; xmlNodePtr ret;
ssize_t child_count; ssize_t child_count;
@ -610,11 +610,11 @@ xmlNodePtr reportxml_node_render_xmlnode(igloo_reportxml_node_t *no
if (!node) if (!node)
return NULL; return NULL;
child_count = reportxml_node_count_child(node); child_count = igloo_reportxml_node_count_child(node);
if (child_count < 0) if (child_count < 0)
return NULL; return NULL;
xml_child_count = reportxml_node_count_xml_child(node); xml_child_count = igloo_reportxml_node_count_xml_child(node);
if (xml_child_count < 0) if (xml_child_count < 0)
return NULL; return NULL;
@ -630,7 +630,7 @@ xmlNodePtr reportxml_node_render_xmlnode(igloo_reportxml_node_t *no
} }
for (i = 0; i < (size_t)child_count; i++) { for (i = 0; i < (size_t)child_count; i++) {
igloo_reportxml_node_t *child = reportxml_node_get_child(node, i); igloo_reportxml_node_t *child = igloo_reportxml_node_get_child(node, i);
xmlNodePtr xmlchild; xmlNodePtr xmlchild;
if (!child) { if (!child) {
@ -638,7 +638,7 @@ xmlNodePtr reportxml_node_render_xmlnode(igloo_reportxml_node_t *no
return NULL; return NULL;
} }
xmlchild = reportxml_node_render_xmlnode(child); xmlchild = igloo_reportxml_node_render_xmlnode(child);
igloo_ro_unref(child); igloo_ro_unref(child);
if (!xmlchild) { if (!xmlchild) {
xmlFreeNode(ret); xmlFreeNode(ret);
@ -660,7 +660,7 @@ xmlNodePtr reportxml_node_render_xmlnode(igloo_reportxml_node_t *no
} }
for (i = 0; i < (size_t)xml_child_count; i++) { for (i = 0; i < (size_t)xml_child_count; i++) {
xmlNodePtr xmlchild = reportxml_node_get_xml_child(node, i); xmlNodePtr xmlchild = igloo_reportxml_node_get_xml_child(node, i);
if (!xmlchild) { if (!xmlchild) {
xmlFreeNode(ret); xmlFreeNode(ret);
@ -674,7 +674,7 @@ xmlNodePtr reportxml_node_render_xmlnode(igloo_reportxml_node_t *no
return ret; return ret;
} }
reportxml_node_type_t reportxml_node_get_type(igloo_reportxml_node_t *node) reportxml_node_type_t igloo_reportxml_node_get_type(igloo_reportxml_node_t *node)
{ {
if (!node) if (!node)
return REPORTXML_NODE_TYPE__ERROR; return REPORTXML_NODE_TYPE__ERROR;
@ -682,7 +682,7 @@ reportxml_node_type_t reportxml_node_get_type(igloo_reportxml_node_t *node)
return node->type; return node->type;
} }
int reportxml_node_set_attribute(igloo_reportxml_node_t *node, const char *key, const char *value) int igloo_reportxml_node_set_attribute(igloo_reportxml_node_t *node, const char *key, const char *value)
{ {
const struct nodedef *nodedef; const struct nodedef *nodedef;
const struct nodeattr *nodeattr; const struct nodeattr *nodeattr;
@ -723,7 +723,7 @@ int reportxml_node_set_attribute(igloo_reportxml_node_t *nod
return 0; return 0;
} }
char * reportxml_node_get_attribute(igloo_reportxml_node_t *node, const char *key) char * igloo_reportxml_node_get_attribute(igloo_reportxml_node_t *node, const char *key)
{ {
xmlChar *k; xmlChar *k;
char *n; char *n;
@ -742,7 +742,7 @@ char * reportxml_node_get_attribute(igloo_reportxml_node_t *nod
return n; return n;
} }
int reportxml_node_add_child(igloo_reportxml_node_t *node, igloo_reportxml_node_t *child) int igloo_reportxml_node_add_child(igloo_reportxml_node_t *node, igloo_reportxml_node_t *child)
{ {
const struct nodedef *nodedef; const struct nodedef *nodedef;
igloo_reportxml_node_t **n; igloo_reportxml_node_t **n;
@ -782,7 +782,7 @@ int reportxml_node_add_child(igloo_reportxml_node_t *node, i
return 0; return 0;
} }
ssize_t reportxml_node_count_child(igloo_reportxml_node_t *node) ssize_t igloo_reportxml_node_count_child(igloo_reportxml_node_t *node)
{ {
if (!node) if (!node)
return -1; return -1;
@ -790,7 +790,7 @@ ssize_t reportxml_node_count_child(igloo_reportxml_node_t *node)
return node->childs_len; return node->childs_len;
} }
igloo_reportxml_node_t * reportxml_node_get_child(igloo_reportxml_node_t *node, size_t idx) igloo_reportxml_node_t * igloo_reportxml_node_get_child(igloo_reportxml_node_t *node, size_t idx)
{ {
if (!node) if (!node)
return NULL; return NULL;
@ -804,7 +804,7 @@ igloo_reportxml_node_t * reportxml_node_get_child(igloo_reportxml_node_t *n
return node->childs[idx]; return node->childs[idx];
} }
igloo_reportxml_node_t * reportxml_node_get_child_by_attribute(igloo_reportxml_node_t *node, const char *key, const char *value, int include_definitions) igloo_reportxml_node_t * igloo_reportxml_node_get_child_by_attribute(igloo_reportxml_node_t *node, const char *key, const char *value, int include_definitions)
{ {
igloo_reportxml_node_t *ret; igloo_reportxml_node_t *ret;
xmlChar *k; xmlChar *k;
@ -830,7 +830,7 @@ igloo_reportxml_node_t * reportxml_node_get_child_by_attribute(igloo_report
return NULL; return NULL;
for (i = 0; i < node->childs_len; i++) { for (i = 0; i < node->childs_len; i++) {
ret = reportxml_node_get_child_by_attribute(node->childs[i], key, value, include_definitions); ret = igloo_reportxml_node_get_child_by_attribute(node->childs[i], key, value, include_definitions);
if (ret != NULL) if (ret != NULL)
return ret; return ret;
} }
@ -838,7 +838,7 @@ igloo_reportxml_node_t * reportxml_node_get_child_by_attribute(igloo_report
return NULL; return NULL;
} }
igloo_reportxml_node_t * reportxml_node_get_child_by_type(igloo_reportxml_node_t *node, reportxml_node_type_t type, int include_definitions) igloo_reportxml_node_t * igloo_reportxml_node_get_child_by_type(igloo_reportxml_node_t *node, reportxml_node_type_t type, int include_definitions)
{ {
size_t i; size_t i;
@ -857,7 +857,7 @@ igloo_reportxml_node_t * reportxml_node_get_child_by_type(igloo_reportxml_n
for (i = 0; i < node->childs_len; i++) { for (i = 0; i < node->childs_len; i++) {
igloo_reportxml_node_t *ret; igloo_reportxml_node_t *ret;
ret = reportxml_node_get_child_by_type(node->childs[i], type, include_definitions); ret = igloo_reportxml_node_get_child_by_type(node->childs[i], type, include_definitions);
if (ret != NULL) if (ret != NULL)
return ret; return ret;
} }
@ -865,7 +865,7 @@ igloo_reportxml_node_t * reportxml_node_get_child_by_type(igloo_reportxml_n
return NULL; return NULL;
} }
int reportxml_node_set_content(igloo_reportxml_node_t *node, const char *value) int igloo_reportxml_node_set_content(igloo_reportxml_node_t *node, const char *value)
{ {
const struct nodedef *nodedef; const struct nodedef *nodedef;
char *n = NULL; char *n = NULL;
@ -890,7 +890,7 @@ int reportxml_node_set_content(igloo_reportxml_node_t *node,
return 0; return 0;
} }
char * reportxml_node_get_content(igloo_reportxml_node_t *node) char * igloo_reportxml_node_get_content(igloo_reportxml_node_t *node)
{ {
if (!node) if (!node)
return NULL; return NULL;
@ -902,7 +902,7 @@ char * reportxml_node_get_content(igloo_reportxml_node_t *node)
} }
} }
int reportxml_node_add_xml_child(igloo_reportxml_node_t *node, xmlNodePtr child) int igloo_reportxml_node_add_xml_child(igloo_reportxml_node_t *node, xmlNodePtr child)
{ {
const struct nodedef *nodedef; const struct nodedef *nodedef;
xmlNodePtr *n; xmlNodePtr *n;
@ -930,7 +930,7 @@ int reportxml_node_add_xml_child(igloo_reportxml_node_t *nod
return 0; return 0;
} }
ssize_t reportxml_node_count_xml_child(igloo_reportxml_node_t *node) ssize_t igloo_reportxml_node_count_xml_child(igloo_reportxml_node_t *node)
{ {
if (!node) if (!node)
return -1; return -1;
@ -938,7 +938,7 @@ ssize_t reportxml_node_count_xml_child(igloo_reportxml_node_t *n
return node->xml_childs_len; return node->xml_childs_len;
} }
xmlNodePtr reportxml_node_get_xml_child(igloo_reportxml_node_t *node, size_t idx) xmlNodePtr igloo_reportxml_node_get_xml_child(igloo_reportxml_node_t *node, size_t idx)
{ {
xmlNodePtr ret; xmlNodePtr ret;
@ -968,8 +968,8 @@ static int __compare_definitions(void *arg, void *a, void *b)
char *id_a, *id_b; char *id_a, *id_b;
int ret = 0; int ret = 0;
id_a = reportxml_node_get_attribute(a, "defines"); id_a = igloo_reportxml_node_get_attribute(a, "defines");
id_b = reportxml_node_get_attribute(b, "defines"); id_b = igloo_reportxml_node_get_attribute(b, "defines");
if (!id_a || !id_b || id_a == id_b) { if (!id_a || !id_b || id_a == id_b) {
ret = 0; ret = 0;
@ -997,7 +997,7 @@ static int __database_new(igloo_ro_t self, const igloo_ro_type_t *type, va_list
return 0; return 0;
} }
int reportxml_database_add_report(igloo_reportxml_database_t *db, igloo_reportxml_t *report) int igloo_reportxml_database_add_report(igloo_reportxml_database_t *db, igloo_reportxml_t *report)
{ {
igloo_reportxml_node_t *root; igloo_reportxml_node_t *root;
ssize_t count; ssize_t count;
@ -1006,26 +1006,26 @@ int reportxml_database_add_report(igloo_reportxml_database_t
if (!db || !report) if (!db || !report)
return -1; return -1;
root = reportxml_get_root_node(report); root = igloo_reportxml_get_root_node(report);
if (!root) if (!root)
return -1; return -1;
count = reportxml_node_count_child(root); count = igloo_reportxml_node_count_child(root);
if (count < 0) if (count < 0)
return -1; return -1;
igloo_thread_mutex_lock(&(db->lock)); igloo_thread_mutex_lock(&(db->lock));
for (i = 0; i < (size_t)count; i++) { for (i = 0; i < (size_t)count; i++) {
igloo_reportxml_node_t *node = reportxml_node_get_child(root, i); igloo_reportxml_node_t *node = igloo_reportxml_node_get_child(root, i);
igloo_reportxml_node_t *copy; igloo_reportxml_node_t *copy;
if (reportxml_node_get_type(node) != REPORTXML_NODE_TYPE_DEFINITION) { if (igloo_reportxml_node_get_type(node) != REPORTXML_NODE_TYPE_DEFINITION) {
igloo_ro_unref(node); igloo_ro_unref(node);
continue; continue;
} }
copy = reportxml_node_copy(node); copy = igloo_reportxml_node_copy(node);
igloo_ro_unref(node); igloo_ro_unref(node);
if (!copy) if (!copy)
@ -1052,15 +1052,15 @@ static int __attach_copy_of_node_or_definition(igloo_reportxml_node_t *parent, i
if (depth >= 2) { if (depth >= 2) {
definition = reportxml_node_get_attribute(node, "definition"); definition = igloo_reportxml_node_get_attribute(node, "definition");
if (definition) { if (definition) {
def = reportxml_database_build_node(db, definition, depth - 1); def = igloo_reportxml_database_build_node(db, definition, depth - 1);
free(definition); free(definition);
} }
} }
if (def) { if (def) {
ssize_t count = reportxml_node_count_child(def); ssize_t count = igloo_reportxml_node_count_child(def);
size_t i; size_t i;
if (count < 0) { if (count < 0) {
@ -1069,7 +1069,7 @@ static int __attach_copy_of_node_or_definition(igloo_reportxml_node_t *parent, i
} }
for (i = 0; i < (size_t)count; i++) { for (i = 0; i < (size_t)count; i++) {
igloo_reportxml_node_t *child = reportxml_node_get_child(def, i); igloo_reportxml_node_t *child = igloo_reportxml_node_get_child(def, i);
if (__attach_copy_of_node_or_definition(parent, child, db, depth - 1) != 0) { if (__attach_copy_of_node_or_definition(parent, child, db, depth - 1) != 0) {
igloo_ro_unref(child); igloo_ro_unref(child);
@ -1091,7 +1091,7 @@ static int __attach_copy_of_node_or_definition(igloo_reportxml_node_t *parent, i
return -1; return -1;
} }
ret = reportxml_node_add_child(parent, copy); ret = igloo_reportxml_node_add_child(parent, copy);
igloo_ro_unref(copy); igloo_ro_unref(copy);
@ -1124,11 +1124,11 @@ static igloo_reportxml_node_t * __reportxml_database_build_node_ext(igloo_r
if (!depth) if (!depth)
return NULL; return NULL;
search = reportxml_node_new(REPORTXML_NODE_TYPE_DEFINITION, NULL, NULL, NULL); search = igloo_reportxml_node_new(REPORTXML_NODE_TYPE_DEFINITION, NULL, NULL, NULL);
if (!search) if (!search)
return NULL; return NULL;
if (reportxml_node_set_attribute(search, "defines", id) != 0) { if (igloo_reportxml_node_set_attribute(search, "defines", id) != 0) {
igloo_ro_unref(search); igloo_ro_unref(search);
return NULL; return NULL;
} }
@ -1148,26 +1148,26 @@ static igloo_reportxml_node_t * __reportxml_database_build_node_ext(igloo_r
} }
igloo_thread_mutex_unlock(&(db->lock)); igloo_thread_mutex_unlock(&(db->lock));
count = reportxml_node_count_child(found); count = igloo_reportxml_node_count_child(found);
if (count < 0) { if (count < 0) {
igloo_ro_unref(found); igloo_ro_unref(found);
return NULL; return NULL;
} }
template = reportxml_node_get_attribute(found, "template"); template = igloo_reportxml_node_get_attribute(found, "template");
if (template) { if (template) {
igloo_reportxml_node_t *tpl = reportxml_database_build_node(db, template, depth - 1); igloo_reportxml_node_t *tpl = igloo_reportxml_database_build_node(db, template, depth - 1);
free(template); free(template);
if (tpl) { if (tpl) {
ret = reportxml_node_copy(tpl); ret = igloo_reportxml_node_copy(tpl);
igloo_ro_unref(tpl); igloo_ro_unref(tpl);
} else { } else {
ret = NULL; ret = NULL;
} }
} else { } else {
ret = reportxml_node_new(REPORTXML_NODE_TYPE_DEFINITION, NULL, NULL, NULL); ret = igloo_reportxml_node_new(REPORTXML_NODE_TYPE_DEFINITION, NULL, NULL, NULL);
} }
if (!ret) { if (!ret) {
@ -1178,8 +1178,8 @@ static igloo_reportxml_node_t * __reportxml_database_build_node_ext(igloo_r
for (i = 0; i < (size_t)count; i++) { for (i = 0; i < (size_t)count; i++) {
/* TODO: Look up definitions of our childs and childs' childs. */ /* TODO: Look up definitions of our childs and childs' childs. */
igloo_reportxml_node_t *node = reportxml_node_get_child(found, i); igloo_reportxml_node_t *node = igloo_reportxml_node_get_child(found, i);
reportxml_node_type_t type = reportxml_node_get_type(node); reportxml_node_type_t type = igloo_reportxml_node_get_type(node);
switch (all_childs_same_type) { switch (all_childs_same_type) {
case ACST_FIRST: case ACST_FIRST:
@ -1209,21 +1209,21 @@ static igloo_reportxml_node_t * __reportxml_database_build_node_ext(igloo_r
igloo_ro_unref(found); igloo_ro_unref(found);
if (all_childs_same_type == ACST_YES) { if (all_childs_same_type == ACST_YES) {
count = reportxml_node_count_child(ret); count = igloo_reportxml_node_count_child(ret);
if (count < 0) { if (count < 0) {
igloo_ro_unref(ret); igloo_ro_unref(ret);
return NULL; return NULL;
} }
for (i = 0; i < (size_t)count; i++) { for (i = 0; i < (size_t)count; i++) {
igloo_reportxml_node_t *node = reportxml_node_get_child(ret, i); igloo_reportxml_node_t *node = igloo_reportxml_node_get_child(ret, i);
if (!node) { if (!node) {
igloo_ro_unref(ret); igloo_ro_unref(ret);
return NULL; return NULL;
} }
if (reportxml_node_set_attribute(node, "_definition", id) != 0) { if (igloo_reportxml_node_set_attribute(node, "_definition", id) != 0) {
igloo_ro_unref(node); igloo_ro_unref(node);
igloo_ro_unref(ret); igloo_ro_unref(ret);
return NULL; return NULL;
@ -1244,13 +1244,13 @@ static igloo_reportxml_node_t * __reportxml_database_build_node_ext(igloo_r
return ret; return ret;
} }
igloo_reportxml_node_t * reportxml_database_build_node(igloo_reportxml_database_t *db, const char *id, ssize_t depth) igloo_reportxml_node_t * igloo_reportxml_database_build_node(igloo_reportxml_database_t *db, const char *id, ssize_t depth)
{ {
return __reportxml_database_build_node_ext(db, id, depth, NULL); return __reportxml_database_build_node_ext(db, id, depth, NULL);
} }
/* We try to build a a report from the definition. Exat structure depends on what is defined. */ /* We try to build a a report from the definition. Exat structure depends on what is defined. */
igloo_reportxml_t * reportxml_database_build_report(igloo_reportxml_database_t *db, const char *id, ssize_t depth) igloo_reportxml_t * igloo_reportxml_database_build_report(igloo_reportxml_database_t *db, const char *id, ssize_t depth)
{ {
igloo_reportxml_node_t *definition; igloo_reportxml_node_t *definition;
igloo_reportxml_node_t *child; igloo_reportxml_node_t *child;
@ -1271,7 +1271,7 @@ igloo_reportxml_t * reportxml_database_build_report(igloo_reportxml_da
} }
/* Let's see how many children we have. */ /* Let's see how many children we have. */
count = reportxml_node_count_child(definition); count = igloo_reportxml_node_count_child(definition);
if (count < 0) { if (count < 0) {
igloo_ro_unref(definition); igloo_ro_unref(definition);
return NULL; return NULL;
@ -1283,13 +1283,13 @@ igloo_reportxml_t * reportxml_database_build_report(igloo_reportxml_da
if (type == REPORTXML_NODE_TYPE__ERROR) { if (type == REPORTXML_NODE_TYPE__ERROR) {
/* Now the hard part: find out what level we are. */ /* Now the hard part: find out what level we are. */
child = reportxml_node_get_child(definition, 0); child = igloo_reportxml_node_get_child(definition, 0);
if (!child) { if (!child) {
igloo_ro_unref(definition); igloo_ro_unref(definition);
return NULL; return NULL;
} }
type = reportxml_node_get_type(child); type = igloo_reportxml_node_get_type(child);
igloo_ro_unref(child); igloo_ro_unref(child);
} }
@ -1310,7 +1310,7 @@ igloo_reportxml_t * reportxml_database_build_report(igloo_reportxml_da
return NULL; return NULL;
} }
root = reportxml_get_root_node(ret); root = igloo_reportxml_get_root_node(ret);
if (!ret) { if (!ret) {
igloo_ro_unref(definition); igloo_ro_unref(definition);
igloo_ro_unref(ret); igloo_ro_unref(ret);
@ -1320,9 +1320,9 @@ igloo_reportxml_t * reportxml_database_build_report(igloo_reportxml_da
if (type == REPORTXML_NODE_TYPE_INCIDENT) { if (type == REPORTXML_NODE_TYPE_INCIDENT) {
igloo_ro_ref(attach_to = root); igloo_ro_ref(attach_to = root);
} else if (type == REPORTXML_NODE_TYPE_STATE) { } else if (type == REPORTXML_NODE_TYPE_STATE) {
attach_to = reportxml_node_new(REPORTXML_NODE_TYPE_INCIDENT, NULL, NULL, NULL); attach_to = igloo_reportxml_node_new(REPORTXML_NODE_TYPE_INCIDENT, NULL, NULL, NULL);
if (attach_to) { if (attach_to) {
if (reportxml_node_add_child(root, attach_to) != 0) { if (igloo_reportxml_node_add_child(root, attach_to) != 0) {
igloo_ro_unref(attach_to); igloo_ro_unref(attach_to);
attach_to = NULL; attach_to = NULL;
} }
@ -1342,18 +1342,18 @@ igloo_reportxml_t * reportxml_database_build_report(igloo_reportxml_da
/* now move nodes. */ /* now move nodes. */
for (i = 0; i < (size_t)count; i++) { for (i = 0; i < (size_t)count; i++) {
child = reportxml_node_get_child(definition, i); child = igloo_reportxml_node_get_child(definition, i);
if (reportxml_node_get_type(child) == type) { if (igloo_reportxml_node_get_type(child) == type) {
/* Attach definition to all childs that are the same type. /* Attach definition to all childs that are the same type.
* As long as we work to-the-specs all childs are of the same type. * As long as we work to-the-specs all childs are of the same type.
* But if we work in relaxed mode, there might be other tags. * But if we work in relaxed mode, there might be other tags.
*/ */
reportxml_node_set_attribute(child, "definition", id); igloo_reportxml_node_set_attribute(child, "definition", id);
} }
/* we can directly attach as it's a already a copy. */ /* we can directly attach as it's a already a copy. */
if (reportxml_node_add_child(attach_to, child) != 0) { if (igloo_reportxml_node_add_child(attach_to, child) != 0) {
igloo_ro_unref(definition); igloo_ro_unref(definition);
igloo_ro_unref(attach_to); igloo_ro_unref(attach_to);
igloo_ro_unref(ret); igloo_ro_unref(ret);