AIR
/
mxml
mirror of https://github.com/michaelrsweet/mxml.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prep for 2.8 release...

Browse Source
pull/193/head
Michael R Sweet 11 years ago
parent ace5aa8686
commit 4351cf060c
23 changed files with 77 additions and 197 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      ANNOUNCEMENT
  2. 2
      CHANGES
  3. 4
      Makefile.in
  4. 14
      README
  5. 4
      config.h.in
  6. 6
      makesrcdist
  7. 7
      mvalidate.c
  8. 4
      mxml-attr.c
  9. 15
      mxml-entity.c
  10. 4
      mxml-file.c
  11. 23
      mxml-get.c
  12. 7
      mxml-index.c
  13. 27
      mxml-node.c
  14. 38
      mxml-private.c
  15. 4
      mxml-private.h
  16. 13
      mxml-search.c
  17. 16
      mxml-set.c
  18. 4
      mxml-string.c
  19. 4
      mxml.h
  20. 10
      mxml.list.in
  21. 30
      mxmldoc.c
  22. 12
      testmxml.c
  23. 6
      vcnet/config.h

20
ANNOUNCEMENT
Unescape View File

@ -1,14 +1,12 @@
Mini-XML 2.7 is now available for download from:
Mini-XML 2.8 is now available for download from:
http://www.minixml.org/software.php
http://www.msweet.org/downloads.php/Mini-XML
Mini-XML 2.7 fixes some minor platform and XML issues. Changes include:
Mini-XML 2.8 fixes some minor platform and XML issues. Changes include:
- Updated the source headers to reference the Mini-XML license and its
exceptions to the LGPL2 (STR #108)
- The shared library did not include a destructor for the thread-
specific data key on UNIX-based operating systems (STR #103)
- mxmlLoad* did not error out on XML with multiple root nodes (STR #101)
- Fixed an issue with the _mxml_vstrdupf function (STR #107)
- mxmlSave* no longer write all siblings of the passed node, just that
node and its children (STR #109)
- Now call docsetutil using xcrun on OS X (Bug #458)
- mxmldoc did not escape special HTML characters inside @code foo@
comments.
- Fixed a memory leak in mxmlElementDeleteAttr (Bug #452)
- Added MXML_MAJOR/MINOR_VERSION definitions to mxml.h (Bug $461)
- Fixed a bug reading UTF-16 characters from a file (Bug #454)

2
CHANGES
Unescape View File

@ -1,4 +1,4 @@
CHANGES - 2013-11-11
CHANGES - 2014-01-04
--------------------
CHANGES IN Mini-XML 2.8

4
Makefile.in
Unescape View File

@ -3,7 +3,7 @@
#
# Makefile for Mini-XML, a small XML-like file parsing library.
#
# Copyright 2003-2013 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
#
#

14
README
Unescape View File

@ -1,10 +1,10 @@
README - 2011-12-20
README - 2014-01-04
-------------------
INTRODUCTION
This README file describes the Mini-XML library version 2.7.
This README file describes the Mini-XML library version 2.8.
Mini-XML is a small XML parsing library that you can use to read XML and
XML-like data files in your application without requiring large non-standard
@ -50,8 +50,8 @@ BUILDING Mini-XML
make
If you are using Mini-XML under Microsoft Windows with Visual C++ 2008, use
the included project files in the "vcnet" subdirectory to build the library
If you are using Mini-XML under Microsoft Windows with Visual C++, use the
included project files in the "vcnet" subdirectory to build the library
instead.
@ -184,13 +184,13 @@ DOCUMENTATION
GETTING HELP AND REPORTING PROBLEMS
The Mini-XML web site provides access to a discussion forum and bug
The Mini-XML project page provides access to a discussion forum and bug
reporting page:
http://www.minixml.org/
http://www.msweet.org/projects.php/Mini-XML
LEGAL STUFF
The Mini-XML library is Copyright 2003-2011 by Michael Sweet. License terms
The Mini-XML library is Copyright 2003-2014 by Michael Sweet. License terms
are described in the file "COPYING".

4
config.h.in
Unescape View File

@ -3,7 +3,7 @@
*
* 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
@ -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
*/
/*

6
makesrcdist
Unescape View File

@ -17,11 +17,11 @@ fi
cd /tmp
if test $version = snapshot; then
url="https://svn.easysw.com/public/mxml/trunk"
url="https://svn.msweet.org/mxml/trunk"
else
url="https://svn.easysw.com/public/mxml/tags/release-$version"
url="svn+ssh://svn.msweet.org/var/svn/mxml/tags/release-$version"
svn copy https://svn.easysw.com/public/mxml/trunk "$url" \
svn copy svn+ssh://svn.msweet.org/var/svn/mxml/trunk "$url" \
-m "Tag $version" || exit 1
fi

7
mvalidate.c
Unescape View File

@ -4,7 +4,7 @@
* XML Schema validation program 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,10 +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:
*
* http://www.msweet.org/projects.php/Mini-XML
*/
/*

4
mxml-attr.c
Unescape View File

@ -3,7 +3,7 @@
*
* Attribute support code for Mini-XML, a small XML-like file parsing library.
*
* Copyright 2003-2013 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
*/
/*

15
mxml-entity.c
Unescape View File

@ -4,7 +4,7 @@
* 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
*/
/*

4
mxml-file.c
Unescape View File

@ -3,7 +3,7 @@
*
* File loading code for Mini-XML, a small XML-like file parsing library.
*
* Copyright 2003-2013 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
*/
/*

23
mxml-get.c
Unescape View File

@ -3,7 +3,7 @@
*
* 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
*/
/*

7
mxml-index.c
Unescape View File

@ -3,7 +3,7 @@
*
* 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
*/
/*

27
mxml-node.c
Unescape View File

@ -3,7 +3,7 @@
*
* 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 */

38
mxml-private.c
Unescape View File

@ -3,7 +3,7 @@
*
* 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);

4
mxml-private.h
Unescape View File

@ -3,7 +3,7 @@
*
* 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
*/
/*

13
mxml-search.c
Unescape View File

@ -4,7 +4,7 @@
* 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@
*/

16
mxml-set.c
Unescape View File

@ -3,7 +3,7 @@
*
* 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
*/
/*

4
mxml-string.c
Unescape View File

@ -3,7 +3,7 @@
*
* String functions for Mini-XML, a small XML-like file parsing library.
*
* Copyright 2003-2013 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
*/
/*

4
mxml.h
Unescape View File

@ -3,7 +3,7 @@
*
* Header file for Mini-XML, a small XML-like file parsing library.
*
* Copyright 2003-2013 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
*/
/*

10
mxml.list.in
Unescape View File

@ -3,7 +3,7 @@
#
# EPM software list file for Mini-XML, a small XML library.
#
# Copyright 2003-2009 by Michael Sweet.
# Copyright 2003-2014 by Michael Sweet.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
@ -31,7 +31,7 @@ $PICFLAG=@PICFLAG@
# Product information
%product mxml
%copyright 2003-2009 by Michael Sweet
%copyright 2003-2014 by Michael Sweet
%vendor Michael Sweet
%license ${srcdir}/COPYING
%readme ${srcdir}/README
@ -79,9 +79,9 @@ f 0555 root sys ${libdir}/libmxml.1.dylib libmxml.1.dylib
l 0555 root sys ${libdir}/libmxml.dylib libmxml.1.dylib
%system freebsd irix linux netbsd openbsd solaris tru64
f 0555 root sys ${libdir}/libmxml.so.1.4 libmxml.so.1.4
l 0555 root sys ${libdir}/libmxml.so.1 libmxml.so.1.4
l 0555 root sys ${libdir}/libmxml.so libmxml.so.1.4
f 0555 root sys ${libdir}/libmxml.so.1.5 libmxml.so.1.5
l 0555 root sys ${libdir}/libmxml.so.1 libmxml.so.1.5
l 0555 root sys ${libdir}/libmxml.so libmxml.so.1.5
%system all
%endif

30
mxmldoc.c
Unescape View File

@ -5,7 +5,7 @@
* Documentation generator using Mini-XML, a small XML-like file parsing
* library.
*
* Copyright 2003-2013 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
@ -14,34 +14,6 @@
* missing or damaged, see the license at:
*
* http://www.minixml.org/
*
* Contents:
*
* main() - Main entry for test program.
* add_variable() - Add a variable or argument.
* find_public() - Find a public function, type, etc.
* get_comment_info() - Get info from comment.
* get_text() - Get the text for a node.
* load_cb() - Set the type of child nodes.
* new_documentation() - Create a new documentation tree.
* remove_directory() - Remove a directory.
* safe_strcpy() - Copy a string allowing for overlapping strings.
* scan_file() - Scan a source file.
* sort_node() - Insert a node sorted into a tree.
* update_comment() - Update a comment node.
* usage() - Show program usage...
* write_description() - Write the description text.
* write_element() - Write an element's text nodes.
* write_file() - Copy a file to the output.
* write_function() - Write documentation for a function.
* write_html() - Write HTML documentation.
* write_html_head() - Write the standard HTML header.
* write_man() - Write manpage documentation.
* write_scu() - Write a structure, class, or union.
* write_string() - Write a string, quoting HTML special chars as needed.
* write_toc() - Write a table-of-contents.
* write_tokens() - Write <Token> nodes for all APIs.
* ws_cb() - Whitespace callback for saving.
*/
/*

12
testmxml.c
Unescape View File

@ -3,7 +3,7 @@
*
* Test program 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,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:
*
* main() - Main entry for test program.
* sax_cb() - SAX callback.
* type_cb() - XML data type callback for mxmlLoadFile()...
* whitespace_cb() - Let the mxmlSaveFile() function know when to insert
* newlines and tabs...
* http://www.msweet.org/projects.php/Mini-XML
*/
/*

6
vcnet/config.h
Unescape View File

@ -3,7 +3,7 @@
*
* 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
@ -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
*/
/*
@ -64,7 +64,7 @@
* Version number...
*/
#define MXML_VERSION "Mini-XML v2.7"
#define MXML_VERSION "Mini-XML v2.8"
/*

Write Preview
Loading…
Cancel
Save