From e77b8b111643cc34c3c5f65307f883336c73507a Mon Sep 17 00:00:00 2001 From: Matthias Schneebeli Date: Thu, 15 Feb 2007 11:59:54 +0000 Subject: [PATCH] Go back to revision 44. The good modifications of rev. 45 and 46 will be added in the following commits. The reason for this is a bad commit in rev. 45. --- mxml.c | 328 ++++++++++++++++++++++++++++++++------------------------- mxml.h | 43 ++++---- 2 files changed, 203 insertions(+), 168 deletions(-) diff --git a/mxml.c b/mxml.c index 1458180..a91a525 100755 --- a/mxml.c +++ b/mxml.c @@ -10,10 +10,10 @@ functions can be used: writer = mxml_open_file(file_name); - mxml_start_element(writer, name); - mxml_write_attribute(writer, name, value); - mxml_write_value(writer, value); - mxml_end_element(writer); + mxml_start_element(writer, name); + mxml_write_attribute(writer, name, value); + mxml_write_value(writer, value); + mxml_end_element(writer); ... mxml_close_file(writer); @@ -78,7 +78,15 @@ #define XML_INDENT " " -static int mxml_suppress_date_flag = 0; /* suppress writing date at the top of file. */ +/* local prototypes */ +static PMXML_NODE read_error(PMXML_NODE root, const char *file_name, int line_number, char *error, int error_size, char *format, ...); +static void mxml_encode(char *src, int size, int translate); +static void mxml_decode(char *str); +static int mxml_write_subtree(MXML_WRITER *writer, PMXML_NODE tree, int indent); +static int mxml_write_line(MXML_WRITER *writer, const char *line); +static int mxml_start_element1(MXML_WRITER *writer, const char *name, int indent); +static int mxml_add_resultnode(PMXML_NODE node, const char *xml_path, PMXML_NODE **nodelist, int *found); +static int mxml_find_nodes1(PMXML_NODE tree, const char *xml_path, PMXML_NODE **nodelist, int *found); /*------------------------------------------------------------------*/ @@ -103,11 +111,12 @@ int mxml_write_line(MXML_WRITER *writer, const char *line) return 0; } - /*------------------------------------------------------------------*/ +/** + * open a memory buffer and write XML header + */ MXML_WRITER *mxml_open_buffer() -/* open a file and write XML header */ { char str[256], line[1000]; time_t now; @@ -129,8 +138,7 @@ MXML_WRITER *mxml_open_buffer() strcpy(str, ctime(&now)); str[24] = 0; sprintf(line, "\n", str); - if (mxml_suppress_date_flag == 0) - mxml_write_line(writer, line); + mxml_write_line(writer, line); /* initialize stack */ writer->level = 0; @@ -141,16 +149,10 @@ MXML_WRITER *mxml_open_buffer() /*------------------------------------------------------------------*/ -void mxml_suppress_date(int suppress) - /* suppress writing date at the top of file. */ -{ - mxml_suppress_date_flag = suppress; -} - -/*------------------------------------------------------------------*/ - +/** + * open a file and write XML header + */ MXML_WRITER *mxml_open_file(const char *file_name) -/* open a file and write XML header */ { char str[256], line[1000]; time_t now; @@ -176,8 +178,7 @@ MXML_WRITER *mxml_open_file(const char *file_name) strcpy(str, ctime(&now)); str[24] = 0; sprintf(line, "\n", str); - if (mxml_suppress_date_flag == 0) - mxml_write_line(writer, line); + mxml_write_line(writer, line); /* initialize stack */ writer->level = 0; @@ -188,8 +189,10 @@ MXML_WRITER *mxml_open_file(const char *file_name) /*------------------------------------------------------------------*/ +/** + * convert '<' '>' '&' '"' ''' into &xx; + */ void mxml_encode(char *src, int size, int translate) -/* convert '<' '>' '&' '"' ''' into &xx; */ { char *ps, *pd; static char *buffer = NULL; @@ -209,7 +212,7 @@ void mxml_encode(char *src, int size, int translate) pd = buffer; for (ps = src ; *ps && (size_t)pd - (size_t)buffer < (size_t)(size-10) ; ps++) { - if (translate) { // tranlate "<", ">", "&", """, "'" + if (translate) { /* tranlate "<", ">", "&", """, "'" */ switch (*ps) { case '<': strcpy(pd, "<"); @@ -235,7 +238,7 @@ void mxml_encode(char *src, int size, int translate) *pd++ = *ps; } } else { - switch (*ps) { // translate only illegal XML characters "<" and "&" + switch (*ps) { /* translate only illegal XML characters "<" and "&" */ case '<': strcpy(pd, "<"); pd += 4; @@ -256,8 +259,10 @@ void mxml_encode(char *src, int size, int translate) /*------------------------------------------------------------------*/ +/** + * reverse of mxml_encode, strip leading or trailing '"' + */ void mxml_decode(char *str) -/* reverse of mxml_encode, strip leading or trailing '"' */ { char *p; @@ -292,8 +297,10 @@ void mxml_decode(char *str) /*------------------------------------------------------------------*/ +/** + * set translation of <,>,",',&, on/off in writer + */ int mxml_set_translate(MXML_WRITER *writer, int flag) -/* set translation of <,>,",',&, on/off in writer */ { int old_flag; @@ -303,8 +310,10 @@ int mxml_set_translate(MXML_WRITER *writer, int flag) } /*------------------------------------------------------------------*/ +/** + * start a new XML element, must be followed by mxml_end_elemnt + */ int mxml_start_element1(MXML_WRITER *writer, const char *name, int indent) -/* start a new XML element, must be followed by mxml_end_elemnt */ { int i; char line[1000], name_enc[1000]; @@ -354,8 +363,10 @@ int mxml_start_element_noindent(MXML_WRITER *writer, const char *name) /*------------------------------------------------------------------*/ +/** + * close an open XML element + */ int mxml_end_element(MXML_WRITER *writer) -/* close an open XML element */ { int i; char line[1000]; @@ -393,10 +404,12 @@ int mxml_end_element(MXML_WRITER *writer) /*------------------------------------------------------------------*/ +/** + * write an attribute to the currently open XML element + */ int mxml_write_attribute(MXML_WRITER *writer, const char *name, const char *value) -/* write an attribute to the currently open XML element */ { - char name_enc[4000], val_enc[4000], line[8000]; + char name_enc[1000], val_enc[1000], line[2000]; if (!writer->element_is_open) return FALSE; @@ -413,8 +426,10 @@ int mxml_write_attribute(MXML_WRITER *writer, const char *name, const char *valu /*------------------------------------------------------------------*/ +/** + * write value of an XML element, like <[name]>[value] + */ int mxml_write_value(MXML_WRITER *writer, const char *data) -/* write value of an XML element, like <[name]>[value] */ { static char *data_enc; static int data_size = 0; @@ -442,24 +457,10 @@ int mxml_write_value(MXML_WRITER *writer, const char *data) /*------------------------------------------------------------------*/ -int mxml_write_empty_line(MXML_WRITER *writer) -/* write empty line */ -{ - if (writer->element_is_open) { - mxml_write_line(writer, ">\n"); - writer->element_is_open = FALSE; - } - - if (mxml_write_line(writer, "\n") != 1) - return FALSE; - - return TRUE; -} - -/*------------------------------------------------------------------*/ - +/** + * write a comment to an XML file, enclosed in "" + */ int mxml_write_comment(MXML_WRITER *writer, const char *string) -/* write a comment to an XML file, enclosed in "" */ { int i; char line[1000]; @@ -482,20 +483,12 @@ int mxml_write_comment(MXML_WRITER *writer, const char *string) return TRUE; } -int mxml_write_element(MXML_WRITER *writer, const char *name, const char *value) -{ - int i; - - i = mxml_start_element(writer, name); - i += mxml_write_value(writer, value); - i += mxml_end_element(writer); - return i; -} - /*------------------------------------------------------------------*/ +/** + * close a file opened with mxml_open_writer + */ char *mxml_close_buffer(MXML_WRITER *writer) -/* close a file opened with mxml_open_writer */ { int i; char *p; @@ -517,8 +510,10 @@ char *mxml_close_buffer(MXML_WRITER *writer) /*------------------------------------------------------------------*/ +/** + * close a file opened with mxml_open_writer + */ int mxml_close_file(MXML_WRITER *writer) -/* close a file opened with mxml_open_writer */ { int i; @@ -539,8 +534,10 @@ int mxml_close_file(MXML_WRITER *writer) /*------------------------------------------------------------------*/ +/** + * create root node of an XML tree + */ PMXML_NODE mxml_create_root_node() -/* create root node of an XML tree */ { PMXML_NODE root; @@ -553,8 +550,10 @@ PMXML_NODE mxml_create_root_node() /*------------------------------------------------------------------*/ -PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, char *node_name, char *value, int index) -/* add a subnode (child) to an existing parent node as a specific position */ +/** + * add a subnode (child) to an existing parent node as a specific position + */ +PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, const char *node_name, const char *value, int index) { PMXML_NODE pnode, pchild; int i, j; @@ -601,32 +600,40 @@ PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, char *node /*------------------------------------------------------------------*/ -PMXML_NODE mxml_add_special_node(PMXML_NODE parent, int node_type, char *node_name, char *value) -/* add a subnode (child) to an existing parent node at the end */ +/** + * add a subnode (child) to an existing parent node at the end + */ +PMXML_NODE mxml_add_special_node(PMXML_NODE parent, int node_type, const char *node_name, const char *value) { return mxml_add_special_node_at(parent, node_type, node_name, value, parent->n_children); } /*------------------------------------------------------------------*/ -PMXML_NODE mxml_add_node(PMXML_NODE parent, char *node_name, char *value) -/* add a subnode (child) to an existing parent node at the end */ +/** + * write value of an XML element, like <[name]>[value] + */ +PMXML_NODE mxml_add_node(PMXML_NODE parent, const char *node_name, const char *value) { return mxml_add_special_node_at(parent, ELEMENT_NODE, node_name, value, parent->n_children); } /*------------------------------------------------------------------*/ -PMXML_NODE mxml_add_node_at(PMXML_NODE parent, char *node_name, char *value, int index) -/* add a subnode (child) to an existing parent node at the end */ +/** + * add a subnode (child) to an existing parent node at the end + */ +PMXML_NODE mxml_add_node_at(PMXML_NODE parent, const char *node_name, const char *value, int index) { return mxml_add_special_node_at(parent, ELEMENT_NODE, node_name, value, index); } /*------------------------------------------------------------------*/ +/** + * add a whole node tree to an existing parent node at a specific position + */ int mxml_add_tree_at(PMXML_NODE parent, PMXML_NODE tree, int index) -/* add a whole node tree to an existing parent node at a specific position */ { PMXML_NODE pchild; int i, j; @@ -680,16 +687,20 @@ int mxml_add_tree_at(PMXML_NODE parent, PMXML_NODE tree, int index) /*------------------------------------------------------------------*/ +/** + * add a whole node tree to an existing parent node at the end + */ int mxml_add_tree(PMXML_NODE parent, PMXML_NODE tree) -/* add a whole node tree to an existing parent node at the end */ { return mxml_add_tree_at(parent, tree, parent->n_children); } /*------------------------------------------------------------------*/ -int mxml_add_attribute(PMXML_NODE pnode, char *attrib_name, char *attrib_value) -/* add an attribute to an existing node */ +/** + * add an attribute to an existing node + */ +int mxml_add_attribute(PMXML_NODE pnode, const char *attrib_name, const char *attrib_value) { if (pnode->n_attributes == 0) { pnode->attribute_name = (char*)malloc(MXML_NAME_LENGTH); @@ -709,8 +720,10 @@ int mxml_add_attribute(PMXML_NODE pnode, char *attrib_name, char *attrib_value) /*------------------------------------------------------------------*/ +/** + * return number of subnodes (children) of a node + */ int mxml_get_number_of_children(PMXML_NODE pnode) -/* return number of subnodes (children) of a node */ { assert(pnode); return pnode->n_children; @@ -718,8 +731,10 @@ int mxml_get_number_of_children(PMXML_NODE pnode) /*------------------------------------------------------------------*/ +/** + * return number of subnodes (children) of a node + */ PMXML_NODE mxml_subnode(PMXML_NODE pnode, int index) -/* return number of subnodes (children) of a node */ { assert(pnode); if (index < pnode->n_children) @@ -729,9 +744,8 @@ PMXML_NODE mxml_subnode(PMXML_NODE pnode, int index) /*------------------------------------------------------------------*/ -int mxml_find_nodes1(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist, int *found); -int mxml_add_resultnode(PMXML_NODE node, char *xml_path, PMXML_NODE **nodelist, int *found) +int mxml_add_resultnode(PMXML_NODE node, const char *xml_path, PMXML_NODE **nodelist, int *found) { /* if at end of path, add this node */ if (*xml_path == 0) { @@ -752,8 +766,7 @@ int mxml_add_resultnode(PMXML_NODE node, char *xml_path, PMXML_NODE **nodelist, /*------------------------------------------------------------------*/ -int mxml_find_nodes1(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist, int *found) -/* +/** Return list of XML nodes with a subset of XPATH specifications. Following elemets are possible @@ -764,9 +777,11 @@ int mxml_find_nodes1(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist, int /[=]/ Find subnode of the above /[@=]/ Find a node which has a specific attribute */ +int mxml_find_nodes1(PMXML_NODE tree, const char *xml_path, PMXML_NODE **nodelist, int *found) { PMXML_NODE pnode; - char *p1, *p2, *p3, node_name[256], condition[256]; + const char *p1,*p2; + char *p3, node_name[256], condition[256]; char cond_name[MXML_MAX_CONDITION][256], cond_value[MXML_MAX_CONDITION][256]; int cond_type[MXML_MAX_CONDITION]; int i, j, k, index, num_cond; @@ -804,7 +819,7 @@ int mxml_find_nodes1(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist, int p2++; } else { /* evaluate [<@attrib>/=] */ - while (*p2 && isspace(*p2)) + while (*p2 && isspace((unsigned char)*p2)) p2++; strlcpy(condition, p2, sizeof(condition)); if (strchr(condition, ']')) @@ -813,12 +828,10 @@ int mxml_find_nodes1(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist, int return 0; p2 = strchr(p2, ']')+1; if ((p3 = strchr(condition, '=')) != NULL) { - if (condition[0] == '@') { cond_type[num_cond] = 1; - strlcpy(cond_name[num_cond], &condition[1], sizeof(cond_name[num_cond]) - 1); - } - else { + strlcpy(cond_name[num_cond], &condition[1], sizeof(cond_name[num_cond])); + } else { strlcpy(cond_name[num_cond], condition, sizeof(cond_name[num_cond])); } @@ -901,7 +914,7 @@ int mxml_find_nodes1(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist, int /*------------------------------------------------------------------*/ -int mxml_find_nodes(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist) +int mxml_find_nodes(PMXML_NODE tree, const char *xml_path, PMXML_NODE **nodelist) { int status, found = 0; @@ -915,11 +928,11 @@ int mxml_find_nodes(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist) /*------------------------------------------------------------------*/ -PMXML_NODE mxml_find_node(PMXML_NODE tree, char *xml_path) -/* - Search for a specific XML node with a subset of XPATH specifications. - Return first found node. For syntax see mxml_find_nodes() -*/ +/** + * Search for a specific XML node with a subset of XPATH specifications. + * Return first found node. For syntax see mxml_find_nodes() + */ +PMXML_NODE mxml_find_node(PMXML_NODE tree, const char *xml_path) { PMXML_NODE *node, pnode; int n; @@ -952,7 +965,7 @@ char *mxml_get_value(PMXML_NODE pnode) /*------------------------------------------------------------------*/ -char *mxml_get_attribute(PMXML_NODE pnode, char *name) +char *mxml_get_attribute(PMXML_NODE pnode, const char *name) { int i; @@ -966,7 +979,7 @@ char *mxml_get_attribute(PMXML_NODE pnode, char *name) /*------------------------------------------------------------------*/ -int mxml_replace_node_name(PMXML_NODE pnode, char *name) +int mxml_replace_node_name(PMXML_NODE pnode, const char *name) { strlcpy(pnode->name, name, sizeof(pnode->name)); return TRUE; @@ -974,7 +987,7 @@ int mxml_replace_node_name(PMXML_NODE pnode, char *name) /*------------------------------------------------------------------*/ -int mxml_replace_node_value(PMXML_NODE pnode, char *value) +int mxml_replace_node_value(PMXML_NODE pnode, const char *value) { if (pnode->value) pnode->value = (char *)realloc(pnode->value, strlen(value)+1); @@ -991,8 +1004,7 @@ int mxml_replace_node_value(PMXML_NODE pnode, char *value) /*------------------------------------------------------------------*/ -int mxml_replace_subvalue(PMXML_NODE pnode, char *name, char *value) -/* +/** replace value os a subnode, like @@ -1001,6 +1013,7 @@ int mxml_replace_subvalue(PMXML_NODE pnode, char *name, char *value) if pnode=parent, and "name"="child", then "value" gets replaced */ +int mxml_replace_subvalue(PMXML_NODE pnode, const char *name, const char *value) { int i; @@ -1016,8 +1029,10 @@ int mxml_replace_subvalue(PMXML_NODE pnode, char *name, char *value) /*------------------------------------------------------------------*/ -int mxml_replace_attribute_name(PMXML_NODE pnode, char *old_name, char *new_name) -/* change the name of an attribute, keep its value */ +/** + * change the name of an attribute, keep its value + */ +int mxml_replace_attribute_name(PMXML_NODE pnode, const char *old_name, const char *new_name) { int i; @@ -1034,8 +1049,10 @@ int mxml_replace_attribute_name(PMXML_NODE pnode, char *old_name, char *new_name /*------------------------------------------------------------------*/ -int mxml_replace_attribute_value(PMXML_NODE pnode, char *attrib_name, char *attrib_value) -/* change the value of an attribute */ +/** + * change the value of an attribute + */ +int mxml_replace_attribute_value(PMXML_NODE pnode, const char *attrib_name, const char *attrib_value) { int i; @@ -1053,8 +1070,10 @@ int mxml_replace_attribute_value(PMXML_NODE pnode, char *attrib_name, char *attr /*------------------------------------------------------------------*/ +/** + * free memory of a node and remove it from the parent's child list + */ int mxml_delete_node(PMXML_NODE pnode) -/* free memory of a node and remove it from the parent's child list */ { PMXML_NODE parent; int i, j; @@ -1087,7 +1106,7 @@ int mxml_delete_node(PMXML_NODE pnode) /*------------------------------------------------------------------*/ -int mxml_delete_attribute(PMXML_NODE pnode, char *attrib_name) +int mxml_delete_attribute(PMXML_NODE pnode, const char *attrib_name) { int i, j; @@ -1119,8 +1138,10 @@ int mxml_delete_attribute(PMXML_NODE pnode, char *attrib_name) #define HERE root, file_name, line_number, error, error_size -PMXML_NODE read_error(PMXML_NODE root, char *file_name, int line_number, char *error, int error_size, char *format, ...) -/* used inside mxml_parse_file for reporting errors */ +/** + * used inside mxml_parse_file for reporting errors + */ +PMXML_NODE read_error(PMXML_NODE root, const char *file_name, int line_number, char *error, int error_size, char *format, ...) { char *msg, str[1000]; va_list argptr; @@ -1145,18 +1166,20 @@ PMXML_NODE read_error(PMXML_NODE root, char *file_name, int line_number, char *e /*------------------------------------------------------------------*/ -PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) -/* parse a XML buffer and convert it into a tree of MXML_NODE's. Return NULL - in case of an error, return error description. Optional file_name is used - for error reporting if called from mxml_parse_file() */ +/** + * Parse a XML buffer and convert it into a tree of MXML_NODE's. + * Return NULL in case of an error, return error description. + * Optional file_name is used for error reporting if called from mxml_parse_file() + */ +PMXML_NODE mxml_parse_buffer(const char *buf, char *error, int error_size) { - char node_name[256], attrib_name[256], attrib_value[1000]; - char *p, *pv; + char node_name[256], attrib_name[256], attrib_value[1000], quote; + const char *p, *pv; int i,j, line_number; PMXML_NODE root, ptree, pnew; int end_element; size_t len; - char *file_name = NULL; // dummy for 'HERE' + char *file_name = NULL; /* dummy for 'HERE' */ p = buf; line_number = 1; @@ -1259,7 +1282,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) if (*p == '/') { end_element = TRUE; p++; - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1271,7 +1294,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) /* extract node name */ i = 0; node_name[i] = 0; - while (*p && !isspace(*p) && *p != '/' && *p != '>' && *p != '<') + while (*p && !isspace((unsigned char)*p) && *p != '/' && *p != '>' && *p != '<') node_name[i++] = *p++; node_name[i] = 0; if (!*p) @@ -1301,7 +1324,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) /* allocate new element structure in parent tree */ pnew = mxml_add_node(ptree, node_name, NULL); - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1313,7 +1336,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) /* found attribute */ pv = p; - while (*pv && !isspace(*pv) && *pv != '=' && *pv != '<' && *pv != '>') + while (*pv && !isspace((unsigned char)*pv) && *pv != '=' && *pv != '<' && *pv != '>') pv++; if (!*pv) return read_error(HERE, "Unexpected end of file"); @@ -1328,7 +1351,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) attrib_name[len] = 0; p = pv; - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1339,20 +1362,21 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) return read_error(HERE, "Expect \"=\" here"); p++; - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; } if (!*p) return read_error(HERE, "Unexpected end of file"); - if (*p != '\"') - return read_error(HERE, "Expect \'\"\' here"); + if (*p != '\"' && *p != '\'') + return read_error(HERE, "Expect \" or \' here"); + quote = *p; p++; /* extract attribute value */ pv = p; - while (*pv && *pv != '\"') + while (*pv && *pv != quote) pv++; if (!*pv) return read_error(HERE, "Unexpected end of file"); @@ -1367,7 +1391,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) mxml_add_attribute(pnew, attrib_name, attrib_value); p = pv+1; - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1381,7 +1405,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) /* found empty node, like , just skip closing bracket */ p++; - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1399,7 +1423,7 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) /* check if we have sub-element or value */ pv = p; - while (*pv && isspace(*pv)) { + while (*pv && isspace((unsigned char)*pv)) { if (*pv == '\n') line_number++; pv++; @@ -1451,10 +1475,12 @@ PMXML_NODE mxml_parse_buffer(char *buf, char *error, int error_size) /*------------------------------------------------------------------*/ -int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) -/* parse !ENTYTY entries of XML files and replace with references. Return 0 - in case of no errors, return error description. Optional file_name is used - for error reporting if called from mxml_parse_file() */ +/** + * parse !ENTYTY entries of XML files and replace with references. + * Return 0 in case of no errors, return error description. + * Optional file_name is used for error reporting if called from mxml_parse_file() + */ +int mxml_parse_entity(char **buf, const char *file_name, char *error, int error_size) { char *p; char *pv; @@ -1525,7 +1551,7 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) /* found new entity */ p++; - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1575,7 +1601,7 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) /* extract entity name */ p = pv; - while (*p && isspace(*p) && *p != '<' && *p != '>') { + while (*p && isspace((unsigned char)*p) && *p != '<' && *p != '>') { if (*p == '\n') line_number++; p++; @@ -1596,7 +1622,7 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) } pv = p; - while (*pv && !isspace(*pv) && *pv != '<' && *pv != '>') + while (*pv && !isspace((unsigned char)*pv) && *pv != '<' && *pv != '>') pv++; if (!*pv) { @@ -1619,7 +1645,7 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) entity_name[nentity][0] = '&'; i = 1; entity_name[nentity][i] = 0; - while (*p && !isspace(*p) && *p != '/' && *p != '>' && *p != '<' && i < 253) + while (*p && !isspace((unsigned char)*p) && *p != '/' && *p != '>' && *p != '<' && i < 253) entity_name[nentity][i++] = *p++; entity_name[nentity][i++] = ';'; entity_name[nentity][i] = 0; @@ -1640,7 +1666,7 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) } /* extract replacement or SYSTEM */ - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1669,7 +1695,7 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) } /* extract replacement */ - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1754,7 +1780,7 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) free(replacement); p = pv; - while (*p && isspace(*p)) { + while (*p && isspace((unsigned char)*p)) { if (*p == '\n') line_number++; p++; @@ -1894,9 +1920,11 @@ int mxml_parse_entity(char **buf, char *file_name, char *error, int error_size) /*------------------------------------------------------------------*/ -PMXML_NODE mxml_parse_file(char *file_name, char *error, int error_size) -/* parse a XML file and convert it into a tree of MXML_NODE's. Return NULL - in case of an error, return error description */ +/** + * parse a XML file and convert it into a tree of MXML_NODE's. + * Return NULL in case of an error, return error description + */ +PMXML_NODE mxml_parse_file(const char *file_name, char *error, int error_size) { char *buf, line[1000]; int fh, length; @@ -1944,8 +1972,10 @@ PMXML_NODE mxml_parse_file(char *file_name, char *error, int error_size) /*------------------------------------------------------------------*/ +/** + * write complete subtree recursively into file opened with mxml_open_document() + */ int mxml_write_subtree(MXML_WRITER *writer, PMXML_NODE tree, int indent) -/* write complete subtree recursively into file opened with mxml_open_document() */ { int i; @@ -1967,8 +1997,10 @@ int mxml_write_subtree(MXML_WRITER *writer, PMXML_NODE tree, int indent) /*------------------------------------------------------------------*/ -int mxml_write_tree(char *file_name, PMXML_NODE tree) -/* write a complete XML tree to a file */ +/** + * write a complete XML tree to a file + */ +int mxml_write_tree(const char *file_name, PMXML_NODE tree) { MXML_WRITER *writer; int i; @@ -1979,7 +2011,7 @@ int mxml_write_tree(char *file_name, PMXML_NODE tree) return FALSE; for (i=0 ; in_children ; i++) - if (tree->child[i].node_type == ELEMENT_NODE) // skip PI and comments + if (tree->child[i].node_type == ELEMENT_NODE) /* skip PI and comments */ if (!mxml_write_subtree(writer, &tree->child[i], TRUE)) return FALSE; @@ -2019,8 +2051,10 @@ PMXML_NODE mxml_clone_tree(PMXML_NODE tree) /*------------------------------------------------------------------*/ +/** + * print XML tree for debugging + */ void mxml_debug_tree(PMXML_NODE tree, int level) -/* print XML tree for debugging */ { int i, j; @@ -2060,9 +2094,11 @@ void mxml_debug_tree(PMXML_NODE tree, int level) /*------------------------------------------------------------------*/ +/** + * free memory of XML tree, must be called after any + * mxml_create_root_node() or mxml_parse_file() + */ void mxml_free_tree(PMXML_NODE tree) -/* free memory of XML tree, must be called after any - mxml_create_root_node() or mxml_parse_file() */ { int i; @@ -2116,7 +2152,8 @@ void mxml_test() */ /*------------------------------------------------------------------*/ -/* mxml_basename deletes any prefix ending with the last slash '/' character + /** + mxml_basename deletes any prefix ending with the last slash '/' character present in path. mxml_dirname deletes the filename portion, beginning with the last slash '/' character to the end of path. Followings are examples from these functions @@ -2129,7 +2166,8 @@ void mxml_test() "path/to/test.txt" "path/to" "test.txt" "test.txt "." "test.txt" - Under Windows, '\\' and ':' are recognized ad separator too. */ + Under Windows, '\\' and ':' are recognized ad separator too. + */ void mxml_basename(char *path) { diff --git a/mxml.h b/mxml.h index 1a58e43..b1e6a6c 100755 --- a/mxml.h +++ b/mxml.h @@ -73,53 +73,50 @@ extern "C" { #endif #endif -void mxml_suppress_date(int suppress); MXML_WRITER *mxml_open_file(const char *file_name); -MXML_WRITER *mxml_open_buffer(void); +MXML_WRITER *mxml_open_buffer(void); int mxml_set_translate(MXML_WRITER *writer, int flag); int mxml_start_element(MXML_WRITER *writer, const char *name); int mxml_start_element_noindent(MXML_WRITER *writer, const char *name); -int mxml_end_element(MXML_WRITER *writer); +int mxml_end_element(MXML_WRITER *writer); int mxml_write_comment(MXML_WRITER *writer, const char *string); -int mxml_write_element(MXML_WRITER *writer, const char *name, const char *value); int mxml_write_attribute(MXML_WRITER *writer, const char *name, const char *value); int mxml_write_value(MXML_WRITER *writer, const char *value); -int mxml_write_empty_line(MXML_WRITER *writer); char *mxml_close_buffer(MXML_WRITER *writer); int mxml_close_file(MXML_WRITER *writer); int mxml_get_number_of_children(PMXML_NODE pnode); PMXML_NODE mxml_subnode(PMXML_NODE pnode, int index); -PMXML_NODE mxml_find_node(PMXML_NODE tree, char *xml_path); -int mxml_find_nodes(PMXML_NODE tree, char *xml_path, PMXML_NODE **nodelist); +PMXML_NODE mxml_find_node(PMXML_NODE tree, const char *xml_path); +int mxml_find_nodes(PMXML_NODE tree, const char *xml_path, PMXML_NODE **nodelist); char *mxml_get_name(PMXML_NODE pnode); char *mxml_get_value(PMXML_NODE pnode); -char *mxml_get_attribute(PMXML_NODE pnode, char *name); +char *mxml_get_attribute(PMXML_NODE pnode, const char *name); -int mxml_add_attribute(PMXML_NODE pnode, char *attrib_name, char *attrib_value); -PMXML_NODE mxml_add_special_node(PMXML_NODE parent, int node_type, char *node_name, char *value); -PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, char *node_name, char *value, int index); -PMXML_NODE mxml_add_node(PMXML_NODE parent, char *node_name, char *value); -PMXML_NODE mxml_add_node_at(PMXML_NODE parent, char *node_name, char *value, int index); +int mxml_add_attribute(PMXML_NODE pnode, const char *attrib_name, const char *attrib_value); +PMXML_NODE mxml_add_special_node(PMXML_NODE parent, int node_type, const char *node_name, const char *value); +PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, const char *node_name, const char *value, int index); +PMXML_NODE mxml_add_node(PMXML_NODE parent, const char *node_name, const char *value); +PMXML_NODE mxml_add_node_at(PMXML_NODE parent, const char *node_name, const char *value, int index); PMXML_NODE mxml_clone_tree(PMXML_NODE tree); int mxml_add_tree(PMXML_NODE parent, PMXML_NODE tree); int mxml_add_tree_at(PMXML_NODE parent, PMXML_NODE tree, int index); -int mxml_replace_node_name(PMXML_NODE pnode, char *new_name); -int mxml_replace_node_value(PMXML_NODE pnode, char *value); -int mxml_replace_subvalue(PMXML_NODE pnode, char *name, char *value); -int mxml_replace_attribute_name(PMXML_NODE pnode, char *old_name, char *new_name); -int mxml_replace_attribute_value(PMXML_NODE pnode, char *attrib_name, char *attrib_value); +int mxml_replace_node_name(PMXML_NODE pnode, const char *new_name); +int mxml_replace_node_value(PMXML_NODE pnode, const char *value); +int mxml_replace_subvalue(PMXML_NODE pnode, const char *name, const char *value); +int mxml_replace_attribute_name(PMXML_NODE pnode, const char *old_name, const char *new_name); +int mxml_replace_attribute_value(PMXML_NODE pnode, const char *attrib_name, const char *attrib_value); int mxml_delete_node(PMXML_NODE pnode); -int mxml_delete_attribute(PMXML_NODE, char *attrib_name); +int mxml_delete_attribute(PMXML_NODE, const char *attrib_name); PMXML_NODE mxml_create_root_node(); -PMXML_NODE mxml_parse_file(char *file_name, char *error, int error_size); -PMXML_NODE mxml_parse_buffer(char *buffer, char *error, int error_size); -int mxml_parse_entity(char **buf, char* file_name, char *error, int error_size); -int mxml_write_tree(char *file_name, PMXML_NODE tree); +PMXML_NODE mxml_parse_file(const char *file_name, char *error, int error_size); +PMXML_NODE mxml_parse_buffer(const char *buffer, char *error, int error_size); +int mxml_parse_entity(char **buf, const char* file_name, char *error, int error_size); +int mxml_write_tree(const char *file_name, PMXML_NODE tree); void mxml_debug_tree(PMXML_NODE tree, int level); void mxml_free_tree(PMXML_NODE tree);