diff options
Diffstat (limited to 'tools/gator/daemon/mxml')
| -rw-r--r-- | tools/gator/daemon/mxml/config.h | 10 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-attr.c | 19 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-entity.c | 19 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-file.c | 104 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-get.c | 27 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-index.c | 11 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-node.c | 31 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-private.c | 42 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-private.h | 8 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-search.c | 17 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-set.c | 20 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml-string.c | 21 | ||||
| -rw-r--r-- | tools/gator/daemon/mxml/mxml.h | 17 |
13 files changed, 116 insertions, 230 deletions
diff --git a/tools/gator/daemon/mxml/config.h b/tools/gator/daemon/mxml/config.h index 1f59ba34a474..ad6df1d7debe 100644 --- a/tools/gator/daemon/mxml/config.h +++ b/tools/gator/daemon/mxml/config.h @@ -1,10 +1,10 @@ /* config.h. Generated from config.h.in by configure. */ /* - * "$Id: config.h.in 408 2010-09-19 05:26:46Z mike $" + * "$Id: config.h.in 451 2014-01-04 21:50:06Z msweet $" * * Configuration file for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2010 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -12,7 +12,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -30,7 +30,7 @@ * Version number... */ -#define MXML_VERSION "Mini-XML v2.7" +#define MXML_VERSION "Mini-XML v2.8" /* @@ -92,5 +92,5 @@ extern int _mxml_vsnprintf(char *, size_t, const char *, va_list); # endif /* !HAVE_VSNPRINTF */ /* - * End of "$Id: config.h.in 408 2010-09-19 05:26:46Z mike $". + * End of "$Id: config.h.in 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-attr.c b/tools/gator/daemon/mxml/mxml-attr.c index c9950f5fb732..8e89cc1474f8 100644 --- a/tools/gator/daemon/mxml/mxml-attr.c +++ b/tools/gator/daemon/mxml/mxml-attr.c @@ -1,9 +1,9 @@ /* - * "$Id: mxml-attr.c 408 2010-09-19 05:26:46Z mike $" + * "$Id: mxml-attr.c 451 2014-01-04 21:50:06Z msweet $" * * Attribute support code for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2010 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,15 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * mxmlElementDeleteAttr() - Delete an attribute. - * mxmlElementGetAttr() - Get an attribute. - * mxmlElementSetAttr() - Set an attribute. - * mxmlElementSetAttrf() - Set an attribute with a formatted value. - * mxml_set_attr() - Set or add an attribute name/value pair. + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -90,6 +82,9 @@ mxmlElementDeleteAttr(mxml_node_t *node,/* I - Element */ memmove(attr, attr + 1, i * sizeof(mxml_attr_t)); node->value.element.num_attrs --; + + if (node->value.element.num_attrs == 0) + free(node->value.element.attrs); return; } } @@ -315,5 +310,5 @@ mxml_set_attr(mxml_node_t *node, /* I - Element node */ /* - * End of "$Id: mxml-attr.c 408 2010-09-19 05:26:46Z mike $". + * End of "$Id: mxml-attr.c 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-entity.c b/tools/gator/daemon/mxml/mxml-entity.c index c5c9f61f73c2..0d11df6a70bc 100644 --- a/tools/gator/daemon/mxml/mxml-entity.c +++ b/tools/gator/daemon/mxml/mxml-entity.c @@ -1,10 +1,10 @@ /* - * "$Id: mxml-entity.c 408 2010-09-19 05:26:46Z mike $" + * "$Id: mxml-entity.c 451 2014-01-04 21:50:06Z msweet $" * * Character entity support code for Mini-XML, a small XML-like * file parsing library. * - * Copyright 2003-2010 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -12,18 +12,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * mxmlEntityAddCallback() - Add a callback to convert entities to - * Unicode. - * mxmlEntityGetName() - Get the name that corresponds to the - * character value. - * mxmlEntityGetValue() - Get the character corresponding to a named - * entity. - * mxmlEntityRemoveCallback() - Remove a callback. - * _mxml_entity_cb() - Lookup standard (X)HTML entities. + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -456,5 +445,5 @@ _mxml_entity_cb(const char *name) /* I - Entity name */ /* - * End of "$Id: mxml-entity.c 408 2010-09-19 05:26:46Z mike $". + * End of "$Id: mxml-entity.c 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-file.c b/tools/gator/daemon/mxml/mxml-file.c index 7860ee5f8370..3812c253fc3e 100644 --- a/tools/gator/daemon/mxml/mxml-file.c +++ b/tools/gator/daemon/mxml/mxml-file.c @@ -1,9 +1,9 @@ /* - * "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $" + * "$Id: mxml-file.c 455 2014-01-05 03:28:03Z msweet $" * * File loading code for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2011 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,44 +11,11 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * mxmlLoadFd() - Load a file descriptor into an XML node tree. - * mxmlLoadFile() - Load a file into an XML node tree. - * mxmlLoadString() - Load a string into an XML node tree. - * mxmlSaveAllocString() - Save an XML tree to an allocated string. - * mxmlSaveFd() - Save an XML tree to a file descriptor. - * mxmlSaveFile() - Save an XML tree to a file. - * mxmlSaveString() - Save an XML node tree to a string. - * mxmlSAXLoadFd() - Load a file descriptor into an XML node tree - * using a SAX callback. - * mxmlSAXLoadFile() - Load a file into an XML node tree - * using a SAX callback. - * mxmlSAXLoadString() - Load a string into an XML node tree - * using a SAX callback. - * mxmlSetCustomHandlers() - Set the handling functions for custom data. - * mxmlSetErrorCallback() - Set the error message callback. - * mxmlSetWrapMargin() - Set the wrap margin when saving XML data. - * mxml_add_char() - Add a character to a buffer, expanding as needed. - * mxml_fd_getc() - Read a character from a file descriptor. - * mxml_fd_putc() - Write a character to a file descriptor. - * mxml_fd_read() - Read a buffer of data from a file descriptor. - * mxml_fd_write() - Write a buffer of data to a file descriptor. - * mxml_file_getc() - Get a character from a file. - * mxml_file_putc() - Write a character to a file. - * mxml_get_entity() - Get the character corresponding to an entity... - * mxml_load_data() - Load data into an XML node tree. - * mxml_parse_element() - Parse an element for any attributes... - * mxml_string_getc() - Get a character from a string. - * mxml_string_putc() - Write a character to a string. - * mxml_write_name() - Write a name string. - * mxml_write_node() - Save an XML node to a file. - * mxml_write_string() - Write a string, escaping & and < as needed. - * mxml_write_ws() - Do whitespace callback... + * http://www.msweet.org/projects.php/Mini-XML */ +/*** This file modified by ARM on 25 Aug 2014 to avoid pointer overflow when checking if the write position is beyond the end of the buffer in mxmlSaveString and mxml_string_putc ***/ + /* * Include necessary headers... */ @@ -128,7 +95,7 @@ static int mxml_write_node(mxml_node_t *node, void *p, _mxml_global_t *global); static int mxml_write_string(const char *s, void *p, _mxml_putc_cb_t putc_cb); -static int mxml_write_ws(mxml_node_t *node, void *p, +static int mxml_write_ws(mxml_node_t *node, void *p, mxml_save_cb_t cb, int ws, int col, _mxml_putc_cb_t putc_cb); @@ -400,7 +367,7 @@ mxmlSaveString(mxml_node_t *node, /* I - Node to write */ mxml_save_cb_t cb) /* I - Whitespace callback or MXML_NO_CALLBACK */ { int col; /* Final column */ - char *ptr[2]; /* Pointers for putc_cb */ + char *ptr[3]; /* Pointers for putc_cb */ _mxml_global_t *global = _mxml_global(); /* Global data */ @@ -411,6 +378,7 @@ mxmlSaveString(mxml_node_t *node, /* I - Node to write */ ptr[0] = buffer; ptr[1] = buffer + bufsize; + ptr[2] = 0; if ((col = mxml_write_node(node, ptr, cb, 0, mxml_string_putc, global)) < 0) return (-1); @@ -422,7 +390,7 @@ mxmlSaveString(mxml_node_t *node, /* I - Node to write */ * Nul-terminate the buffer... */ - if (ptr[0] >= ptr[1]) + if (ptr[2] != 0) buffer[bufsize - 1] = '\0'; else ptr[0][0] = '\0'; @@ -567,7 +535,7 @@ mxmlSAXLoadString( * * The save function accepts a node pointer and must return a malloc'd * string on success and NULL on error. - * + * */ void @@ -756,7 +724,7 @@ mxml_fd_getc(void *p, /* I - File descriptor buffer */ return (EOF); ch = *(buf->current)++; - + if (ch != 0xff) return (EOF); @@ -775,7 +743,7 @@ mxml_fd_getc(void *p, /* I - File descriptor buffer */ return (EOF); ch = *(buf->current)++; - + if (ch != 0xfe) return (EOF); @@ -1287,8 +1255,8 @@ mxml_file_getc(void *p, /* I - Pointer to file */ * Multi-word UTF-16 char... */ - int lch = (getc(fp) << 8); - lch |= getc(fp); + int lch = getc(fp); + lch = (lch << 8) | getc(fp); if (lch < 0xdc00 || lch >= 0xdfff) return (EOF); @@ -1317,7 +1285,7 @@ mxml_file_getc(void *p, /* I - Pointer to file */ */ int lch = getc(fp); - lch |= (getc(fp) << 8); + lch |= (getc(fp) << 8); if (lch < 0xdc00 || lch >= 0xdfff) return (EOF); @@ -1463,8 +1431,10 @@ mxml_load_data( if (cb && parent) type = (*cb)(parent); - else + else if (parent) type = MXML_TEXT; + else + type = MXML_IGNORE; while ((ch = (*getc_cb)(p, &encoding)) != EOF) { @@ -1518,7 +1488,7 @@ mxml_load_data( default : /* Ignore... */ node = NULL; break; - } + } if (*bufptr) { @@ -1661,9 +1631,9 @@ mxml_load_data( * There can only be one root element! */ - mxml_error("<%s> cannot be a second root node after <%s>", + mxml_error("<%s> cannot be a second root node after <%s>", buffer, first->value.element.name); - goto error; + goto error; } if ((node = mxmlNewElement(parent, buffer)) == NULL) @@ -1729,9 +1699,9 @@ mxml_load_data( * There can only be one root element! */ - mxml_error("<%s> cannot be a second root node after <%s>", + mxml_error("<%s> cannot be a second root node after <%s>", buffer, first->value.element.name); - goto error; + goto error; } if ((node = mxmlNewElement(parent, buffer)) == NULL) @@ -1796,9 +1766,9 @@ mxml_load_data( * There can only be one root element! */ - mxml_error("<%s> cannot be a second root node after <%s>", + mxml_error("<%s> cannot be a second root node after <%s>", buffer, first->value.element.name); - goto error; + goto error; } if ((node = mxmlNewElement(parent, buffer)) == NULL) @@ -1882,9 +1852,9 @@ mxml_load_data( * There can only be one root element! */ - mxml_error("<%s> cannot be a second root node after <%s>", + mxml_error("<%s> cannot be a second root node after <%s>", buffer, first->value.element.name); - goto error; + goto error; } if ((node = mxmlNewElement(parent, buffer)) == NULL) @@ -1974,9 +1944,9 @@ mxml_load_data( * There can only be one root element! */ - mxml_error("<%s> cannot be a second root node after <%s>", + mxml_error("<%s> cannot be a second root node after <%s>", buffer, first->value.element.name); - goto error; + goto error; } if ((node = mxmlNewElement(parent, buffer)) == NULL) @@ -2076,7 +2046,7 @@ mxml_load_data( { node = parent; - while (parent->parent != top && parent->parent) + while (parent != top && parent->parent) parent = parent->parent; if (node != parent) @@ -2286,7 +2256,7 @@ mxml_parse_element( if (ch == '&') if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF) goto error; - + if (mxml_add_char(ch, &ptr, &value, &valsize)) goto error; } @@ -2310,7 +2280,7 @@ mxml_parse_element( if (ch == '&') if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF) goto error; - + if (mxml_add_char(ch, &ptr, &value, &valsize)) goto error; } @@ -2643,8 +2613,12 @@ mxml_string_putc(int ch, /* I - Character to write */ pp = (char **)p; - if (pp[0] < pp[1]) - pp[0][0] = ch; + if (pp[2] == 0) { + if (pp[0] < pp[1]) + pp[0][0] = ch; + else + pp[2] = (char *)1; + } pp[0] ++; @@ -3078,5 +3052,5 @@ mxml_write_ws(mxml_node_t *node, /* I - Current node */ /* - * End of "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $". + * End of "$Id: mxml-file.c 455 2014-01-05 03:28:03Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-get.c b/tools/gator/daemon/mxml/mxml-get.c index a5356d57e186..40ed3d0839b4 100644 --- a/tools/gator/daemon/mxml/mxml-get.c +++ b/tools/gator/daemon/mxml/mxml-get.c @@ -1,9 +1,9 @@ /* - * "$Id: mxml-get.c 427 2011-01-03 02:03:29Z mike $" + * "$Id: mxml-get.c 451 2014-01-04 21:50:06Z msweet $" * * Node get functions for Mini-XML, a small XML-like file parsing library. * - * Copyright 2011 by Michael R Sweet. + * Copyright 2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,26 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * mxmlGetCDATA() - Get the value for a CDATA node. - * mxmlGetCustom() - Get the value for a custom node. - * mxmlGetElement() - Get the name for an element node. - * mxmlGetFirstChild() - Get the first child of an element node. - * mxmlGetInteger() - Get the integer value from the specified node or its - * first child. - * mxmlGetLastChild() - Get the last child of an element node. - * mxmlGetNextSibling() - Get the next node for the current parent. - * mxmlGetOpaque() - Get an opaque string value for a node or its first - * child. - * mxmlGetParent() - Get the parent node. - * mxmlGetPrevSibling() - Get the previous node for the current parent. - * mxmlGetReal() - Get the real value for a node or its first child. - * mxmlGetText() - Get the text value for a node or its first child. - * mxmlGetType() - Get the node type. - * mxmlGetUserData() - Get the user data pointer for a node. + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -467,5 +448,5 @@ mxmlGetUserData(mxml_node_t *node) /* I - Node to get */ /* - * End of "$Id: mxml-get.c 427 2011-01-03 02:03:29Z mike $". + * End of "$Id: mxml-get.c 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-index.c b/tools/gator/daemon/mxml/mxml-index.c index b6efc66f055c..10814390d3a0 100644 --- a/tools/gator/daemon/mxml/mxml-index.c +++ b/tools/gator/daemon/mxml/mxml-index.c @@ -1,9 +1,9 @@ /* - * "$Id: mxml-index.c 426 2011-01-01 23:42:17Z mike $" + * "$Id: mxml-index.c 451 2014-01-04 21:50:06Z msweet $" * * Index support code for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2011 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,10 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -658,5 +655,5 @@ index_sort(mxml_index_t *ind, /* I - Index to sort */ /* - * End of "$Id: mxml-index.c 426 2011-01-01 23:42:17Z mike $". + * End of "$Id: mxml-index.c 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-node.c b/tools/gator/daemon/mxml/mxml-node.c index 44af759f9de3..128cda1a4cf2 100644 --- a/tools/gator/daemon/mxml/mxml-node.c +++ b/tools/gator/daemon/mxml/mxml-node.c @@ -1,9 +1,9 @@ /* - * "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $" + * "$Id: mxml-node.c 451 2014-01-04 21:50:06Z msweet $" * * Node support code for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2011 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,26 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * mxmlAdd() - Add a node to a tree. - * mxmlDelete() - Delete a node and all of its children. - * mxmlGetRefCount() - Get the current reference (use) count for a node. - * mxmlNewCDATA() - Create a new CDATA node. - * mxmlNewCustom() - Create a new custom data node. - * mxmlNewElement() - Create a new element node. - * mxmlNewInteger() - Create a new integer node. - * mxmlNewOpaque() - Create a new opaque string. - * mxmlNewReal() - Create a new real number node. - * mxmlNewText() - Create a new text fragment node. - * mxmlNewTextf() - Create a new formatted text fragment node. - * mxmlRemove() - Remove a node from its parent. - * mxmlNewXML() - Create a new XML document tree. - * mxmlRelease() - Release a node. - * mxmlRetain() - Retain a node. - * mxml_new() - Create a new node. + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -529,7 +510,7 @@ mxmlNewReal(mxml_node_t *parent, /* I - Parent node or MXML_NO_PARENT */ * list. The constant MXML_NO_PARENT can be used to specify that the new * text node has no parent. The whitespace parameter is used to specify * whether leading whitespace is present before the node. The text - * string must be nul-terminated and is copied into the new node. + * string must be nul-terminated and is copied into the new node. */ mxml_node_t * /* O - New node */ @@ -573,7 +554,7 @@ mxmlNewText(mxml_node_t *parent, /* I - Parent node or MXML_NO_PARENT */ * list. The constant MXML_NO_PARENT can be used to specify that the new * text node has no parent. The whitespace parameter is used to specify * whether leading whitespace is present before the node. The format - * string must be nul-terminated and is formatted into the new node. + * string must be nul-terminated and is formatted into the new node. */ mxml_node_t * /* O - New node */ @@ -803,5 +784,5 @@ mxml_new(mxml_node_t *parent, /* I - Parent node */ /* - * End of "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $". + * End of "$Id: mxml-node.c 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-private.c b/tools/gator/daemon/mxml/mxml-private.c index 72f3e2320c7c..bec4bbfbf378 100644 --- a/tools/gator/daemon/mxml/mxml-private.c +++ b/tools/gator/daemon/mxml/mxml-private.c @@ -1,9 +1,9 @@ /* - * "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $" + * "$Id: mxml-private.c 451 2014-01-04 21:50:06Z msweet $" * * Private functions for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2010 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,15 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * mxml_error() - Display an error message. - * mxml_integer_cb() - Default callback for integer values. - * mxml_opaque_cb() - Default callback for opaque values. - * mxml_real_cb() - Default callback for real number values. - * _mxml_global() - Get global data. + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -238,7 +230,7 @@ static DWORD _mxml_tls_index; /* Index for global storage */ /* * 'DllMain()' - Main entry for library. */ - + BOOL WINAPI /* O - Success/failure */ DllMain(HINSTANCE hinst, /* I - DLL module handle */ DWORD reason, /* I - Reason */ @@ -250,28 +242,28 @@ DllMain(HINSTANCE hinst, /* I - DLL module handle */ (void)hinst; (void)reserved; - switch (reason) - { + switch (reason) + { case DLL_PROCESS_ATTACH : /* Called on library initialization */ - if ((_mxml_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) - return (FALSE); - break; + if ((_mxml_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) + return (FALSE); + break; case DLL_THREAD_DETACH : /* Called when a thread terminates */ if ((global = (_mxml_global_t *)TlsGetValue(_mxml_tls_index)) != NULL) free(global); - break; + break; case DLL_PROCESS_DETACH : /* Called when library is unloaded */ if ((global = (_mxml_global_t *)TlsGetValue(_mxml_tls_index)) != NULL) free(global); - TlsFree(_mxml_tls_index); - break; + TlsFree(_mxml_tls_index); + break; - default: - break; - } + default: + break; + } return (TRUE); } @@ -295,7 +287,7 @@ _mxml_global(void) global->entity_cbs[0] = _mxml_entity_cb; global->wrap = 72; - TlsSetValue(_mxml_tls_index, (LPVOID)global); + TlsSetValue(_mxml_tls_index, (LPVOID)global); } return (global); @@ -327,5 +319,5 @@ _mxml_global(void) /* - * End of "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $". + * End of "$Id: mxml-private.c 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-private.h b/tools/gator/daemon/mxml/mxml-private.h index 8789e6c52cbd..c5e4e6b6f27a 100644 --- a/tools/gator/daemon/mxml/mxml-private.h +++ b/tools/gator/daemon/mxml/mxml-private.h @@ -1,9 +1,9 @@ /* - * "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $" + * "$Id: mxml-private.h 451 2014-01-04 21:50:06Z msweet $" * * Private definitions for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2010 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,7 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -46,5 +46,5 @@ extern int _mxml_entity_cb(const char *name); /* - * End of "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $". + * End of "$Id: mxml-private.h 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-search.c b/tools/gator/daemon/mxml/mxml-search.c index f975af1543ca..313a52f0ce2f 100644 --- a/tools/gator/daemon/mxml/mxml-search.c +++ b/tools/gator/daemon/mxml/mxml-search.c @@ -1,10 +1,10 @@ /* - * "$Id: mxml-search.c 427 2011-01-03 02:03:29Z mike $" + * "$Id: mxml-search.c 451 2014-01-04 21:50:06Z msweet $" * * Search/navigation functions for Mini-XML, a small XML-like file * parsing library. * - * Copyright 2003-2010 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -12,14 +12,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * mxmlFindElement() - Find the named element. - * mxmlFindValue() - Find a value with the given path. - * mxmlWalkNext() - Walk to the next logical node in the tree. - * mxmlWalkPrev() - Walk to the previous logical node in the tree. + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -126,7 +119,7 @@ mxmlFindElement(mxml_node_t *node, /* I - Current node */ * * The first child node of the found node is returned if the given node has * children and the first child is a value node. - * + * * @since Mini-XML 2.7@ */ @@ -283,5 +276,5 @@ mxmlWalkPrev(mxml_node_t *node, /* I - Current node */ /* - * End of "$Id: mxml-search.c 427 2011-01-03 02:03:29Z mike $". + * End of "$Id: mxml-search.c 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-set.c b/tools/gator/daemon/mxml/mxml-set.c index b0bd52790b2e..16d4bf1050dd 100644 --- a/tools/gator/daemon/mxml/mxml-set.c +++ b/tools/gator/daemon/mxml/mxml-set.c @@ -1,9 +1,9 @@ /* - * "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $" + * "$Id: mxml-set.c 451 2014-01-04 21:50:06Z msweet $" * * Node set functions for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2011 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,19 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * mxmlSetCDATA() - Set the element name of a CDATA node. - * mxmlSetCustom() - Set the data and destructor of a custom data node. - * mxmlSetElement() - Set the name of an element node. - * mxmlSetInteger() - Set the value of an integer node. - * mxmlSetOpaque() - Set the value of an opaque node. - * mxmlSetReal() - Set the value of a real number node. - * mxmlSetText() - Set the value of a text node. - * mxmlSetTextf() - Set the value of a text node to a formatted string. - * mxmlSetUserData() - Set the user data pointer for a node. + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -345,5 +333,5 @@ mxmlSetUserData(mxml_node_t *node, /* I - Node to set */ /* - * End of "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $". + * End of "$Id: mxml-set.c 451 2014-01-04 21:50:06Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml-string.c b/tools/gator/daemon/mxml/mxml-string.c index 6be42523f95c..9d5b58e6adb7 100644 --- a/tools/gator/daemon/mxml/mxml-string.c +++ b/tools/gator/daemon/mxml/mxml-string.c @@ -1,9 +1,9 @@ /* - * "$Id: mxml-string.c 424 2010-12-25 16:21:50Z mike $" + * "$Id: mxml-string.c 454 2014-01-05 03:25:07Z msweet $" * * String functions for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2010 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,15 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ - * - * Contents: - * - * _mxml_snprintf() - Format a string. - * _mxml_strdup() - Duplicate a string. - * _mxml_strdupf() - Format and duplicate a string. - * _mxml_vsnprintf() - Format a string into a fixed size buffer. - * _mxml_vstrdupf() - Format and duplicate a string. + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -38,7 +30,7 @@ # ifdef __va_copy # define va_copy(dst,src) __va_copy(dst,src) # else -# define va_copy(dst,src) memcpy(&dst, &src, sizeof(va_list)) +# define va_copy(dst,src) memcpy(&dst, src, sizeof(va_list)) # endif /* __va_copy */ #endif /* va_copy */ @@ -157,7 +149,8 @@ _mxml_vsnprintf(char *buffer, /* O - Output buffer */ if (*format == '%') { - if (bufptr && bufptr < bufend) *bufptr++ = *format; + if (bufptr && bufptr < bufend) + *bufptr++ = *format; bytes ++; format ++; continue; @@ -472,5 +465,5 @@ _mxml_vstrdupf(const char *format, /* I - Printf-style format string */ /* - * End of "$Id: mxml-string.c 424 2010-12-25 16:21:50Z mike $". + * End of "$Id: mxml-string.c 454 2014-01-05 03:25:07Z msweet $". */ diff --git a/tools/gator/daemon/mxml/mxml.h b/tools/gator/daemon/mxml/mxml.h index 79c711f4c80f..bba5fd23a67b 100644 --- a/tools/gator/daemon/mxml/mxml.h +++ b/tools/gator/daemon/mxml/mxml.h @@ -1,9 +1,9 @@ /* - * "$Id: mxml.h 427 2011-01-03 02:03:29Z mike $" + * "$Id: mxml.h 451 2014-01-04 21:50:06Z msweet $" * * Header file for Mini-XML, a small XML-like file parsing library. * - * Copyright 2003-2011 by Michael R Sweet. + * Copyright 2003-2014 by Michael R Sweet. * * These coded instructions, statements, and computer programs are the * property of Michael R Sweet and are protected by Federal copyright @@ -11,7 +11,7 @@ * which should have been included with this file. If this file is * missing or damaged, see the license at: * - * http://www.minixml.org/ + * http://www.msweet.org/projects.php/Mini-XML */ /* @@ -36,6 +36,9 @@ * Constants... */ +# define MXML_MAJOR_VERSION 2 /* Major version number */ +# define MXML_MINOR_VERSION 8 /* Minor version number */ + # define MXML_TAB 8 /* Tabs every N columns */ # define MXML_NO_CALLBACK 0 /* Don't use a type callback */ @@ -93,7 +96,7 @@ typedef enum mxml_type_e /**** The XML node type. ****/ typedef void (*mxml_custom_destroy_cb_t)(void *); /**** Custom data destructor ****/ -typedef void (*mxml_error_cb_t)(const char *); +typedef void (*mxml_error_cb_t)(const char *); /**** Error callback function ****/ typedef struct mxml_attr_s /**** An XML element attribute value. @private@ ****/ @@ -161,7 +164,7 @@ typedef struct mxml_index_s mxml_index_t; typedef int (*mxml_custom_load_cb_t)(mxml_node_t *, const char *); /**** Custom data load callback function ****/ -typedef char *(*mxml_custom_save_cb_t)(mxml_node_t *); +typedef char *(*mxml_custom_save_cb_t)(mxml_node_t *); /**** Custom data save callback function ****/ typedef int (*mxml_entity_cb_t)(const char *); @@ -173,7 +176,7 @@ typedef mxml_type_t (*mxml_load_cb_t)(mxml_node_t *); typedef const char *(*mxml_save_cb_t)(mxml_node_t *, int); /**** Save callback function ****/ -typedef void (*mxml_sax_cb_t)(mxml_node_t *, mxml_sax_event_t, void *); +typedef void (*mxml_sax_cb_t)(mxml_node_t *, mxml_sax_event_t, void *); /**** SAX callback function ****/ @@ -325,5 +328,5 @@ extern mxml_type_t mxml_real_cb(mxml_node_t *node); /* - * End of "$Id: mxml.h 427 2011-01-03 02:03:29Z mike $". + * End of "$Id: mxml.h 451 2014-01-04 21:50:06Z msweet $". */ |