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

Change whitespace callback to return a string.

Browse Source
web
Michael R Sweet 20 years ago
parent 82fe862574
commit 465d3e7231
8 changed files with 698 additions and 267 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. 13
      CHANGES
  2. 9
      TODO
  3. 6
      documentation.html
  4. 45
      mxml-file.c
  5. 10
      mxml.h
  6. 789
      mxml.xml
  7. 73
      mxmldoc.c
  8. 20
      testmxml.c

13
CHANGES
Unescape View File

@ -1,16 +1,23 @@
README - 04/30/2004
README - 05/01/2004
-------------------
CHANGES IN Mini-XML 2.0
- Changed the whitespace callback interface to return
strings instead of a single character, allowing for
greater control over the formatting of XML files
written using Mini-XML. THIS CHANGE WILL REQUIRE
CHANGES TO YOUR CODE IF YOU USE WHITESPACE CALLBACKS.
- The mxmldoc utility is now capable of documenting C++
classes, functions, and structures, and correctly
handles C++ comments.
- Added new modular tests for mxmldoc.
- Updated the mxmldoc output to be more compatible with
embedding in manuals produced with HTMLDOC.
- The makefile incorrectly included a "/" separator
between the destination path and install path. This
caused problems when building and installing with
MingW.
- The mxmldoc utility is now capable of documenting C++
structures and classes.
CHANGES IN Mini-XML 1.3

9
TODO
Unescape View File

@ -1,9 +1,6 @@
TODO - 04/29/2004
TODO - 05/01/2004
-----------------
- Update write callback to return a string.
-- Return const char *
-- Loop through chars to figure out correct output column
- UTF-16 support.
-- Auto-detect in strings via initial FFFE or FEFF BOM
-- Convert to UTF-8
@ -21,10 +18,6 @@ TODO - 04/29/2004
- Add access methods and make node structure opaque.
-- To allow for C++ migration
-- To make future binary compatibility easier
- Build test file for mxmldoc.
-- C++ class documentation doesn't seem to work.
-- Do examples of all types of comments/code that mxmldoc is
supposed to handle.
- Add VC++/VC++.NET project files.
-- Include DLL .def file for making a DLL.
- Add C++ class/struct.

6
documentation.html
Unescape View File

@ -523,7 +523,7 @@ allocated.</p>
char *
mxmlSaveAllocString(
<a href='#mxml_node_t'>mxml_node_t</a> * node,
int (*cb)(mxml_node_t *node, int ws));
const char * (*cb)(mxml_node_t *node, int ws));
</pre>
<h4>Arguments</h4>
<p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'>
@ -551,7 +551,7 @@ int
mxmlSaveFile(
<a href='#mxml_node_t'>mxml_node_t</a> * node,
FILE * fp,
int (*cb)(mxml_node_t *node, int ws));
const char * (*cb)(mxml_node_t *node, int ws));
</pre>
<h4>Arguments</h4>
<p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'>
@ -579,7 +579,7 @@ mxmlSaveString(
<a href='#mxml_node_t'>mxml_node_t</a> * node,
char * buffer,
int bufsize,
int (*cb)(mxml_node_t *node, int ws));
const char * (*cb)(mxml_node_t *node, int ws));
</pre>
<h4>Arguments</h4>
<p class='table'><table align='center' border='1' width='80%' cellpadding='5' cellspacing='0' width='80%'>

45
mxml-file.c
Unescape View File

@ -1,5 +1,5 @@
/*
* "$Id: mxml-file.c,v 1.28 2004/04/06 01:47:20 mike Exp $"
* "$Id: mxml-file.c,v 1.29 2004/05/01 15:20:04 mike Exp $"
*
* File loading code for mini-XML, a small XML-like file parsing library.
*
@ -71,13 +71,13 @@ static int mxml_string_putc(int ch, void *p);
static int mxml_write_name(const char *s, void *p,
int (*putc_cb)(int, void *));
static int mxml_write_node(mxml_node_t *node, void *p,
int (*cb)(mxml_node_t *, int),
const char *(*cb)(mxml_node_t *, int),
int col,
int (*putc_cb)(int, void *));
static int mxml_write_string(const char *s, void *p,
int (*putc_cb)(int, void *));
static int mxml_write_ws(mxml_node_t *node, void *p,
int (*cb)(mxml_node_t *, int), int ws,
const char *(*cb)(mxml_node_t *, int), int ws,
int col, int (*putc_cb)(int, void *));
@ -143,7 +143,7 @@ mxmlLoadString(mxml_node_t *top, /* I - Top node */
char * /* O - Allocated string or NULL */
mxmlSaveAllocString(mxml_node_t *node, /* I - Node to write */
int (*cb)(mxml_node_t *node, int ws))
const char *(*cb)(mxml_node_t *node, int ws))
/* I - Whitespace callback or MXML_NO_CALLBACK */
{
int bytes; /* Required bytes */
@ -201,7 +201,7 @@ mxmlSaveAllocString(mxml_node_t *node, /* I - Node to write */
int /* O - 0 on success, -1 on error. */
mxmlSaveFile(mxml_node_t *node, /* I - Node to write */
FILE *fp, /* I - File to write to */
int (*cb)(mxml_node_t *node, int ws))
const char *(*cb)(mxml_node_t *node, int ws))
/* I - Whitespace callback or MXML_NO_CALLBACK */
{
int col; /* Final column */
@ -238,7 +238,7 @@ int /* O - Size of string */
mxmlSaveString(mxml_node_t *node, /* I - Node to write */
char *buffer, /* I - String buffer */
int bufsize, /* I - Size of string buffer */
int (*cb)(mxml_node_t *node, int ws))
const char *(*cb)(mxml_node_t *node, int ws))
/* I - Whitespace callback or MXML_NO_CALLBACK */
{
int col; /* Final column */
@ -1426,7 +1426,7 @@ mxml_write_name(const char *s, /* I - Name to write */
static int /* O - Column or -1 on error */
mxml_write_node(mxml_node_t *node, /* I - Node to write */
void *p, /* I - File to write to */
int (*cb)(mxml_node_t *, int),
const char *(*cb)(mxml_node_t *, int),
/* I - Whitespace callback */
int col, /* I - Current column */
int (*putc_cb)(int, void *))
@ -1699,29 +1699,34 @@ mxml_write_string(const char *s, /* I - String to write */
static int /* O - New column */
mxml_write_ws(mxml_node_t *node, /* I - Current node */
void *p, /* I - Write pointer */
int (*cb)(mxml_node_t *, int),
const char *(*cb)(mxml_node_t *, int),
/* I - Callback function */
int ws, /* I - Where value */
int col, /* I - Current column */
int (*putc_cb)(int, void *))
/* I - Write callback */
{
int ch; /* Whitespace character */
const char *s; /* Whitespace string */
if (cb && (ch = (*cb)(node, ws)) != 0)
if (cb && (s = (*cb)(node, ws)) != NULL)
{
if ((*putc_cb)(ch, p) < 0)
return (-1);
else if (ch == '\n')
col = 0;
else if (ch == '\t')
while (*s)
{
col += MXML_TAB;
col = col - (col % MXML_TAB);
if ((*putc_cb)(*s, p) < 0)
return (-1);
else if (*s == '\n')
col = 0;
else if (*s == '\t')
{
col += MXML_TAB;
col = col - (col % MXML_TAB);
}
else
col ++;
s ++;
}
else
col ++;
}
return (col);
@ -1729,5 +1734,5 @@ mxml_write_ws(mxml_node_t *node, /* I - Current node */
/*
* End of "$Id: mxml-file.c,v 1.28 2004/04/06 01:47:20 mike Exp $".
* End of "$Id: mxml-file.c,v 1.29 2004/05/01 15:20:04 mike Exp $".
*/

10
mxml.h
Unescape View File

@ -1,5 +1,5 @@
/*
* "$Id: mxml.h,v 1.17 2004/04/06 01:47:20 mike Exp $"
* "$Id: mxml.h,v 1.18 2004/05/01 15:20:04 mike Exp $"
*
* Header file for mini-XML, a small XML-like file parsing library.
*
@ -160,12 +160,12 @@ __attribute__ ((__format__ (__printf__, 3, 4)))
;
extern void mxmlRemove(mxml_node_t *node);
extern char *mxmlSaveAllocString(mxml_node_t *node,
int (*cb)(mxml_node_t *, int));
const char *(*cb)(mxml_node_t *, int));
extern int mxmlSaveFile(mxml_node_t *node, FILE *fp,
int (*cb)(mxml_node_t *, int));
const char *(*cb)(mxml_node_t *, int));
extern int mxmlSaveString(mxml_node_t *node, char *buffer,
int bufsize,
int (*cb)(mxml_node_t *, int));
const char *(*cb)(mxml_node_t *, int));
extern int mxmlSetElement(mxml_node_t *node, const char *name);
extern void mxmlSetErrorCallback(void (*cb)(const char *));
extern int mxmlSetInteger(mxml_node_t *node, int integer);
@ -206,5 +206,5 @@ extern mxml_type_t mxml_real_cb(mxml_node_t *node);
/*
* End of "$Id: mxml.h,v 1.17 2004/04/06 01:47:20 mike Exp $".
* End of "$Id: mxml.h,v 1.18 2004/05/01 15:20:04 mike Exp $".
*/

789
mxml.xml
Unescape View File

@ -1,59 +1,111 @@
<?xml version="1.0"?>
<function name="mxmlAdd"><description>Add a node to a tree.
<function name="mxmlAdd">
<description>Add a node to a tree.
Adds the specified node to the parent. If the child argument is not
NULL, puts the new node before or after the specified child depending
on the value of the where argument. If the child argument is NULL,
puts the new node at the beginning of the child list (MXML_ADD_BEFORE)
or at the end of the child list (MXML_ADD_AFTER). The constant
MXML_ADD_TO_PARENT can be used to specify a NULL child pointer.</description><argument
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node</description></argument>
<argument name="where" direction="I"><type>int</type><description>Where to add, MXML_ADD_BEFORE or MXML_ADD_AFTER</description></argument>
<argument name="child" direction="I"><type>mxml_node_t *</type><description>Child node for where or MXML_ADD_TO_PARENT</description></argument>
<argument name="node" direction="I"><type>mxml_node_t *</type><description>Node to add</description></argument>
MXML_ADD_TO_PARENT can be used to specify a NULL child pointer.</description>
<argument name="parent" direction="I">
<type>mxml_node_t *</type>
<description>Parent node</description>
</argument>
<argument name="where" direction="I">
<type>int</type>
<description>Where to add, MXML_ADD_BEFORE or MXML_ADD_AFTER</description>
</argument>
<argument name="child" direction="I">
<type>mxml_node_t *</type>
<description>Child node for where or MXML_ADD_TO_PARENT</description>
</argument>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to add</description>
</argument>
</function>
<function name="mxmlDelete"><description>Delete a node and all of its children.
<function name="mxmlDelete">
<description>Delete a node and all of its children.
If the specified node has a parent, this function first removes the
node from its parent using the mxmlRemove() function.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to delete</description></argument>
node from its parent using the mxmlRemove() function.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to delete</description>
</argument>
</function>
<function name="mxmlElementGetAttr"><returnvalue><description>Attribute value or NULL</description><type>const
char *</type></returnvalue>
<description>Get an attribute.
<function name="mxmlElementGetAttr">
<returnvalue>
<description>Attribute value or NULL</description>
<type>const char *</type>
</returnvalue>
<description>Get an attribute.
This function returns NULL if the node is not an element or the
named attribute does not exist.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Element node</description></argument>
<argument name="name" direction="I"><type>const char *</type><description>Name of attribute</description></argument>
named attribute does not exist.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Element node</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>Name of attribute</description>
</argument>
</function>
<function name="mxmlElementSetAttr"><description>Set an attribute.
<function name="mxmlElementSetAttr">
<description>Set an attribute.
If the named attribute already exists, the value of the attribute
is replaced by the new string value. The string value is copied
into the element node. This function does nothing if the node is
not an element.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Element node</description></argument>
<argument name="name" direction="I"><type>const char *</type><description>Name of attribute</description></argument>
<argument name="value" direction="I"><type>const char *</type><description>Attribute value</description></argument>
not an element.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Element node</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>Name of attribute</description>
</argument>
<argument name="value" direction="I">
<type>const char *</type>
<description>Attribute value</description>
</argument>
</function>
<function name="mxmlEntityGetName"><returnvalue><description>Entity name or NULL</description><type>const
char *</type></returnvalue>
<description>Get the name that corresponds to the character value.
<function name="mxmlEntityGetName">
<returnvalue>
<description>Entity name or NULL</description>
<type>const char *</type>
</returnvalue>
<description>Get the name that corresponds to the character value.
If val does not need to be represented by a named entity, NULL is returned.</description><argument
name="val" direction="I"><type>int</type><description>Character value</description></argument>
If val does not need to be represented by a named entity, NULL is returned.</description>
<argument name="val" direction="I">
<type>int</type>
<description>Character value</description>
</argument>
</function>
<function name="mxmlEntityGetValue"><returnvalue><description>Character value or -1 on error</description><type>int</type></returnvalue>
<description>Get the character corresponding to a named entity.
<function name="mxmlEntityGetValue">
<returnvalue>
<description>Character value or -1 on error</description>
<type>int</type>
</returnvalue>
<description>Get the character corresponding to a named entity.
The entity name can also be a numeric constant. -1 is returned if the
name is not known.</description><argument
name="name" direction="I"><type>const char *</type><description>Entity name</description></argument>
name is not known.</description>
<argument name="name" direction="I">
<type>const char *</type>
<description>Entity name</description>
</argument>
</function>
<function name="mxmlFindElement"><returnvalue><description>Element node or NULL</description><type>mxml_node_t
*</type></returnvalue>
<description>Find the named element.
<function name="mxmlFindElement">
<returnvalue>
<description>Element node or NULL</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Find the named element.
The search is constrained by the name, attribute name, and value; any
NULL names or values are treated as wildcards, so different kinds of
@ -62,17 +114,38 @@ or all elements with a specific attribute. The descend argument determines
whether the search descends into child nodes; normally you will use
MXML_DESCEND_FIRST for the initial search and MXML_NO_DESCEND to find
additional direct descendents of the node. The top node argument
constrains the search to a particular node's children.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Current node</description></argument>
<argument name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument>
<argument name="name" direction="I"><type>const char *</type><description>Element name or NULL for any</description></argument>
<argument name="attr" direction="I"><type>const char *</type><description>Attribute name, or NULL for none</description></argument>
<argument name="value" direction="I"><type>const char *</type><description>Attribute value, or NULL for any</description></argument>
<argument name="descend" direction="I"><type>int</type><description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description></argument>
constrains the search to a particular node's children.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Current node</description>
</argument>
<argument name="top" direction="I">
<type>mxml_node_t *</type>
<description>Top node</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>Element name or NULL for any</description>
</argument>
<argument name="attr" direction="I">
<type>const char *</type>
<description>Attribute name, or NULL for none</description>
</argument>
<argument name="value" direction="I">
<type>const char *</type>
<description>Attribute value, or NULL for any</description>
</argument>
<argument name="descend" direction="I">
<type>int</type>
<description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description>
</argument>
</function>
<function name="mxmlLoadFile"><returnvalue><description>First node or NULL if the file could not be read.</description><type>mxml_node_t
*</type></returnvalue>
<description>Load a file into an XML node tree.
<function name="mxmlLoadFile">
<returnvalue>
<description>First node or NULL if the file could not be read.</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Load a file into an XML node tree.
The nodes in the specified file are added to the specified top node.
If no top node is provided, the XML file MUST be well-formed with a
@ -83,14 +156,26 @@ MXML_ELEMENT or MXML_TEXT nodes.
The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
child nodes of the specified type.</description><argument
name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument>
<argument name="fp" direction="I"><type>FILE *</type><description>File to read from</description></argument>
<argument name="(*cb)(mxml_node_t *node)" direction="I"><type>mxml_type_t</type><description>Callback function or MXML_NO_CALLBACK</description></argument>
child nodes of the specified type.</description>
<argument name="top" direction="I">
<type>mxml_node_t *</type>
<description>Top node</description>
</argument>
<argument name="fp" direction="I">
<type>FILE *</type>
<description>File to read from</description>
</argument>
<argument name="(*cb)(mxml_node_t *node)" direction="I">
<type>mxml_type_t</type>
<description>Callback function or MXML_NO_CALLBACK</description>
</argument>
</function>
<function name="mxmlLoadString"><returnvalue><description>First node or NULL if the string has errors.</description><type>mxml_node_t
*</type></returnvalue>
<description>Load a string into an XML node tree.
<function name="mxmlLoadString">
<returnvalue>
<description>First node or NULL if the string has errors.</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Load a string into an XML node tree.
The nodes in the specified string are added to the specified top node.
If no top node is provided, the XML string MUST be well-formed with a
@ -101,235 +186,529 @@ MXML_ELEMENT or MXML_TEXT nodes.
The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
child nodes of the specified type.</description><argument
name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument>
<argument name="s" direction="I"><type>const char *</type><description>String to load</description></argument>
<argument name="(*cb)(mxml_node_t *node)" direction="I"><type>mxml_type_t</type><description>Callback function or MXML_NO_CALLBACK</description></argument>
child nodes of the specified type.</description>
<argument name="top" direction="I">
<type>mxml_node_t *</type>
<description>Top node</description>
</argument>
<argument name="s" direction="I">
<type>const char *</type>
<description>String to load</description>
</argument>
<argument name="(*cb)(mxml_node_t *node)" direction="I">
<type>mxml_type_t</type>
<description>Callback function or MXML_NO_CALLBACK</description>
</argument>
</function>
<function name="mxmlNewElement"><returnvalue><description>New node</description><type>mxml_node_t
*</type></returnvalue>
<description>Create a new element node.
<function name="mxmlNewElement">
<returnvalue>
<description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new element node.
The new element node is added to the end of the specified parent's child
list. The constant MXML_NO_PARENT can be used to specify that the new
element node has no parent.</description><argument
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument>
<argument name="name" direction="I"><type>const char *</type><description>Name of element</description></argument>
element node has no parent.</description>
<argument name="parent" direction="I">
<type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>Name of element</description>
</argument>
</function>
<function name="mxmlNewInteger"><returnvalue><description>New node</description><type>mxml_node_t
*</type></returnvalue>
<description>Create a new integer node.
<function name="mxmlNewInteger">
<returnvalue>
<description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new integer node.
The new integer node is added to the end of the specified parent's child
list. The constant MXML_NO_PARENT can be used to specify that the new
integer node has no parent.</description><argument
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument>
<argument name="integer" direction="I"><type>int</type><description>Integer value</description></argument>
integer node has no parent.</description>
<argument name="parent" direction="I">
<type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="integer" direction="I">
<type>int</type>
<description>Integer value</description>
</argument>
</function>
<function name="mxmlNewOpaque"><returnvalue><description>New node</description><type>mxml_node_t
*</type></returnvalue>
<description>Create a new opaque string.
<function name="mxmlNewOpaque">
<returnvalue>
<description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new opaque string.
The new opaque node is added to the end of the specified parent's child
list. The constant MXML_NO_PARENT can be used to specify that the new
opaque node has no parent. The opaque string must be nul-terminated and
is copied into the new node.</description><argument
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument>
<argument name="opaque" direction="I"><type>const char *</type><description>Opaque string</description></argument>
is copied into the new node.</description>
<argument name="parent" direction="I">
<type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="opaque" direction="I">
<type>const char *</type>
<description>Opaque string</description>
</argument>
</function>
<function name="mxmlNewReal"><returnvalue><description>New node</description><type>mxml_node_t
*</type></returnvalue>
<description>Create a new real number node.
<function name="mxmlNewReal">
<returnvalue>
<description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new real number node.
The new real number node is added to the end of the specified parent's
child list. The constant MXML_NO_PARENT can be used to specify that
the new real number node has no parent.</description><argument
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument>
<argument name="real" direction="I"><type>double</type><description>Real number value</description></argument>
the new real number node has no parent.</description>
<argument name="parent" direction="I">
<type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="real" direction="I">
<type>double</type>
<description>Real number value</description>
</argument>
</function>
<function name="mxmlNewText"><returnvalue><description>New node</description><type>mxml_node_t
*</type></returnvalue>
<description>Create a new text fragment node.
<function name="mxmlNewText">
<returnvalue>
<description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new text fragment node.
The new text node is added to the end of the specified parent's child
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.</description><argument
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument>
<argument name="whitespace" direction="I"><type>int</type><description>1 = leading whitespace, 0 = no whitespace</description></argument>
<argument name="string" direction="I"><type>const char *</type><description>String</description></argument>
string must be nul-terminated and is copied into the new node.</description>
<argument name="parent" direction="I">
<type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="whitespace" direction="I">
<type>int</type>
<description>1 = leading whitespace, 0 = no whitespace</description>
</argument>
<argument name="string" direction="I">
<type>const char *</type>
<description>String</description>
</argument>
</function>
<function name="mxmlNewTextf"><returnvalue><description>New node</description><type>mxml_node_t
*</type></returnvalue>
<description>Create a new formatted text fragment node.
<function name="mxmlNewTextf">
<returnvalue>
<description>New node</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Create a new formatted text fragment node.
The new text node is added to the end of the specified parent's child
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.</description><argument
name="parent" direction="I"><type>mxml_node_t *</type><description>Parent node or MXML_NO_PARENT</description></argument>
<argument name="whitespace" direction="I"><type>int</type><description>1 = leading whitespace, 0 = no whitespace</description></argument>
<argument name="format" direction="I"><type>const char *</type><description>Printf-style frmat string</description></argument>
<argument name="..." direction="I"><type/><description>Additional args as needed</description></argument>
string must be nul-terminated and is formatted into the new node.</description>
<argument name="parent" direction="I">
<type>mxml_node_t *</type>
<description>Parent node or MXML_NO_PARENT</description>
</argument>
<argument name="whitespace" direction="I">
<type>int</type>
<description>1 = leading whitespace, 0 = no whitespace</description>
</argument>
<argument name="format" direction="I">
<type>const char *</type>
<description>Printf-style frmat string</description>
</argument>
<argument name="..." direction="I">
<type/> <description>Additional args as needed</description>
</argument>
</function>
<function name="mxmlRemove"><description>Remove a node from its parent.
<function name="mxmlRemove">
<description>Remove a node from its parent.
Does not free memory used by the node - use mxmlDelete() for that.
This function does nothing if the node has no parent.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to remove</description></argument>
This function does nothing if the node has no parent.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to remove</description>
</argument>
</function>
<function name="mxmlSaveAllocString"><returnvalue><description>Allocated string or NULL</description><type>char
*</type></returnvalue>
<description>Save an XML node tree to an allocated string.
<function name="mxmlSaveAllocString">
<returnvalue>
<description>Allocated string or NULL</description>
<type>char *</type>
</returnvalue>
<description>Save an XML node tree to an allocated string.
This function returns a pointer to a string containing the textual
representation of the XML node tree. The string should be freed
using the free() function when you are done with it. NULL is returned
if the node would produce an empty string or if the string cannot be
allocated.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to write</description></argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I"><type>int</type><description>Whitespace callback or MXML_NO_CALLBACK</description></argument>
allocated.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to write</description>
</argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I">
<type>const char *</type>
<description>Whitespace callback or MXML_NO_CALLBACK</description>
</argument>
</function>
<function name="mxmlSaveFile"><returnvalue><description>0 on success, -1 on error.</description><type>int</type></returnvalue>
<description>Save an XML tree to a file.
<function name="mxmlSaveFile">
<returnvalue>
<description>0 on success, -1 on error.</description>
<type>int</type>
</returnvalue>
<description>Save an XML tree to a file.
The callback argument specifies a function that returns a whitespace
character or nul (0) before and after each element. If MXML_NO_CALLBACK
is specified, whitespace will only be added before MXML_TEXT nodes
with leading whitespace and before attribute names inside opening
element tags.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to write</description></argument>
<argument name="fp" direction="I"><type>FILE *</type><description>File to write to</description></argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I"><type>int</type><description>Whitespace callback or MXML_NO_CALLBACK</description></argument>
element tags.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to write</description>
</argument>
<argument name="fp" direction="I">
<type>FILE *</type>
<description>File to write to</description>
</argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I">
<type>const char *</type>
<description>Whitespace callback or MXML_NO_CALLBACK</description>
</argument>
</function>
<function name="mxmlSaveString"><returnvalue><description>Size of string</description><type>int</type></returnvalue>
<description>Save an XML node tree to a string.
<function name="mxmlSaveString">
<returnvalue>
<description>Size of string</description>
<type>int</type>
</returnvalue>
<description>Save an XML node tree to a string.
This function returns the total number of bytes that would be
required for the string but only copies (bufsize - 1) characters
into the specified buffer.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to write</description></argument>
<argument name="buffer" direction="I"><type>char *</type><description>String buffer</description></argument>
<argument name="bufsize" direction="I"><type>int</type><description>Size of string buffer</description></argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I"><type>int</type><description>Whitespace callback or MXML_NO_CALLBACK</description></argument>
into the specified buffer.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to write</description>
</argument>
<argument name="buffer" direction="I">
<type>char *</type>
<description>String buffer</description>
</argument>
<argument name="bufsize" direction="I">
<type>int</type>
<description>Size of string buffer</description>
</argument>
<argument name="(*cb)(mxml_node_t *node, int ws)" direction="I">
<type>const char *</type>
<description>Whitespace callback or MXML_NO_CALLBACK</description>
</argument>
</function>
<function name="mxmlSetElement"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue>
<description>Set the name of an element node.
<function name="mxmlSetElement">
<returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the name of an element node.
The node is not changed if it is not an element node.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument>
<argument name="name" direction="I"><type>const char *</type><description>New name string</description></argument>
The node is not changed if it is not an element node.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="name" direction="I">
<type>const char *</type>
<description>New name string</description>
</argument>
</function>
<function name="mxmlSetErrorCallback"><description>Set the error message callback.</description><argument
name="(*cb)(const char *)" direction="I"><type>void</type><description>Error callback function</description></argument>
<function name="mxmlSetErrorCallback">
<description>Set the error message callback.</description>
<argument name="(*cb)(const char *)" direction="I">
<type>void</type>
<description>Error callback function</description>
</argument>
</function>
<function name="mxmlSetInteger"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue>
<description>Set the value of an integer node.
<function name="mxmlSetInteger">
<returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of an integer node.
The node is not changed if it is not an integer node.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument>
<argument name="integer" direction="I"><type>int</type><description>Integer value</description></argument>
The node is not changed if it is not an integer node.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="integer" direction="I">
<type>int</type>
<description>Integer value</description>
</argument>
</function>
<function name="mxmlSetOpaque"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue>
<description>Set the value of an opaque node.
<function name="mxmlSetOpaque">
<returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of an opaque node.
The node is not changed if it is not an opaque node.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument>
<argument name="opaque" direction="I"><type>const char *</type><description>Opaque string</description></argument>
The node is not changed if it is not an opaque node.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="opaque" direction="I">
<type>const char *</type>
<description>Opaque string</description>
</argument>
</function>
<function name="mxmlSetReal"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue>
<description>Set the value of a real number node.
<function name="mxmlSetReal">
<returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of a real number node.
The node is not changed if it is not a real number node.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument>
<argument name="real" direction="I"><type>double</type><description>Real number value</description></argument>
The node is not changed if it is not a real number node.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="real" direction="I">
<type>double</type>
<description>Real number value</description>
</argument>
</function>
<function name="mxmlSetText"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue>
<description>Set the value of a text node.
<function name="mxmlSetText">
<returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of a text node.
The node is not changed if it is not a text node.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument>
<argument name="whitespace" direction="I"><type>int</type><description>1 = leading whitespace, 0 = no whitespace</description></argument>
<argument name="string" direction="I"><type>const char *</type><description>String</description></argument>
The node is not changed if it is not a text node.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="whitespace" direction="I">
<type>int</type>
<description>1 = leading whitespace, 0 = no whitespace</description>
</argument>
<argument name="string" direction="I">
<type>const char *</type>
<description>String</description>
</argument>
</function>
<function name="mxmlSetTextf"><returnvalue><description>0 on success, -1 on failure</description><type>int</type></returnvalue>
<description>Set the value of a text node to a formatted string.
<function name="mxmlSetTextf">
<returnvalue>
<description>0 on success, -1 on failure</description>
<type>int</type>
</returnvalue>
<description>Set the value of a text node to a formatted string.
The node is not changed if it is not a text node.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Node to set</description></argument>
<argument name="whitespace" direction="I"><type>int</type><description>1 = leading whitespace, 0 = no whitespace</description></argument>
<argument name="format" direction="I"><type>const char *</type><description>Printf-style format string</description></argument>
<argument name="..." direction="I"><type/><description>Additional arguments as needed</description></argument>
The node is not changed if it is not a text node.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Node to set</description>
</argument>
<argument name="whitespace" direction="I">
<type>int</type>
<description>1 = leading whitespace, 0 = no whitespace</description>
</argument>
<argument name="format" direction="I">
<type>const char *</type>
<description>Printf-style format string</description>
</argument>
<argument name="..." direction="I">
<type/> <description>Additional arguments as needed</description>
</argument>
</function>
<function name="mxmlWalkNext"><returnvalue><description>Next node or NULL</description><type>mxml_node_t
*</type></returnvalue>
<description>Walk to the next logical node in the tree.
<function name="mxmlWalkNext">
<returnvalue>
<description>Next node or NULL</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Walk to the next logical node in the tree.
The descend argument controls whether the first child is considered
to be the next node. The top node argument constrains the walk to
the node's children.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Current node</description></argument>
<argument name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument>
<argument name="descend" direction="I"><type>int</type><description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description></argument>
the node's children.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Current node</description>
</argument>
<argument name="top" direction="I">
<type>mxml_node_t *</type>
<description>Top node</description>
</argument>
<argument name="descend" direction="I">
<type>int</type>
<description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description>
</argument>
</function>
<function name="mxmlWalkPrev"><returnvalue><description>Previous node or NULL</description><type>mxml_node_t
*</type></returnvalue>
<description>Walk to the previous logical node in the tree.
<function name="mxmlWalkPrev">
<returnvalue>
<description>Previous node or NULL</description>
<type>mxml_node_t *</type>
</returnvalue>
<description>Walk to the previous logical node in the tree.
The descend argument controls whether the previous node's last child
is considered to be the previous node. The top node argument constrains
the walk to the node's children.</description><argument
name="node" direction="I"><type>mxml_node_t *</type><description>Current node</description></argument>
<argument name="top" direction="I"><type>mxml_node_t *</type><description>Top node</description></argument>
<argument name="descend" direction="I"><type>int</type><description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description></argument>
the walk to the node's children.</description>
<argument name="node" direction="I">
<type>mxml_node_t *</type>
<description>Current node</description>
</argument>
<argument name="top" direction="I">
<type>mxml_node_t *</type>
<description>Top node</description>
</argument>
<argument name="descend" direction="I">
<type>int</type>
<description>Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST</description>
</argument>
</function>
<struct name="mxml_attr_s"><description>An XML element attribute value.</description><variable
name="name"><type>char *</type><description>Attribute name</description></variable>
<variable name="value"><type>char *</type><description>Attribute value</description></variable>
<struct name="mxml_attr_s">
<description>An XML element attribute value.</description>
<variable name="name">
<type>char *</type>
<description>Attribute name</description>
</variable>
<variable name="value">
<type>char *</type>
<description>Attribute value</description>
</variable>
</struct>
<typedef name="mxml_attr_t"><description>An XML element attribute value.</description><type>struct
mxml_attr_s</type></typedef>
<typedef name="mxml_element_t"><description>An XML element value.</description><type>struct
mxml_value_s</type></typedef>
<struct name="mxml_node_s"><description>An XML node.</description><variable
name="child"><type>struct mxml_node_s *</type><description>First child node</description></variable>
<variable name="last_child"><type>struct mxml_node_s *</type><description>Last child node</description></variable>
<variable name="next"><type>struct mxml_node_s *</type><description>Next node under same parent</description></variable>
<variable name="parent"><type>struct mxml_node_s *</type><description>Parent node</description></variable>
<variable name="prev"><type>struct mxml_node_s *</type><description>Previous node under same parent</description></variable>
<variable name="type"><type>mxml_type_t</type><description>Node type</description></variable>
<variable name="value"><type>mxml_value_t</type><description>Node value</description></variable>
<typedef name="mxml_attr_t">
<description>An XML element attribute value.</description>
<type>struct mxml_attr_s</type>
</typedef>
<typedef name="mxml_element_t">
<description>An XML element value.</description>
<type>struct mxml_value_s</type>
</typedef>
<struct name="mxml_node_s">
<description>An XML node.</description>
<variable name="child">
<type>struct mxml_node_s *</type>
<description>First child node</description>
</variable>
<variable name="last_child">
<type>struct mxml_node_s *</type>
<description>Last child node</description>
</variable>
<variable name="next">
<type>struct mxml_node_s *</type>
<description>Next node under same parent</description>
</variable>
<variable name="parent">
<type>struct mxml_node_s *</type>
<description>Parent node</description>
</variable>
<variable name="prev">
<type>struct mxml_node_s *</type>
<description>Previous node under same parent</description>
</variable>
<variable name="type">
<type>mxml_type_t</type>
<description>Node type</description>
</variable>
<variable name="value">
<type>mxml_value_t</type>
<description>Node value</description>
</variable>
</struct>
<typedef name="mxml_node_t"><description>An XML node.</description><type>struct
mxml_node_s</type></typedef>
<struct name="mxml_text_s"><description>An XML text value.</description><variable
name="string"><type>char *</type><description>Fragment string</description></variable>
<variable name="whitespace"><type>int</type><description>Leading whitespace?</description></variable>
<typedef name="mxml_node_t">
<description>An XML node.</description>
<type>struct mxml_node_s</type>
</typedef>
<struct name="mxml_text_s">
<description>An XML text value.</description>
<variable name="string">
<type>char *</type>
<description>Fragment string</description>
</variable>
<variable name="whitespace">
<type>int</type>
<description>Leading whitespace?</description>
</variable>
</struct>
<typedef name="mxml_text_t"><description>An XML text value.</description><type>struct
mxml_text_s</type></typedef>
<enumeration name="mxml_type_e"><description>The XML node type.</description><constant
name="MXML_ELEMENT"><description>XML element with attributes</description></constant>
<constant name="MXML_INTEGER"><description>Integer value</description></constant>
<constant name="MXML_OPAQUE"><description>Opaque string</description></constant>
<constant name="MXML_REAL"><description>Real value</description></constant>
<constant name="MXML_TEXT"><description>Text fragment</description></constant>
<typedef name="mxml_text_t">
<description>An XML text value.</description>
<type>struct mxml_text_s</type>
</typedef>
<enumeration name="mxml_type_e">
<description>The XML node type.</description>
<constant name="MXML_ELEMENT">
<description>XML element with attributes</description>
</constant>
<constant name="MXML_INTEGER">
<description>Integer value</description>
</constant>
<constant name="MXML_OPAQUE">
<description>Opaque string</description>
</constant>
<constant name="MXML_REAL">
<description>Real value</description>
</constant>
<constant name="MXML_TEXT">
<description>Text fragment</description>
</constant>
</enumeration>
<typedef name="mxml_type_t"><description>The XML node type.</description><type>enum
mxml_type_e</type></typedef>
<struct name="mxml_value_s"><description>An XML element value.</description><variable
name="attrs"><type>mxml_attr_t *</type><description>Attributes</description></variable>
<variable name="name"><type>char *</type><description>Name of element</description></variable>
<variable name="num_attrs"><type>int</type><description>Number of attributes</description></variable>
<typedef name="mxml_type_t">
<description>The XML node type.</description>
<type>enum mxml_type_e</type>
</typedef>
<struct name="mxml_value_s">
<description>An XML element value.</description>
<variable name="attrs">
<type>mxml_attr_t *</type>
<description>Attributes</description>
</variable>
<variable name="name">
<type>char *</type>
<description>Name of element</description>
</variable>
<variable name="num_attrs">
<type>int</type>
<description>Number of attributes</description>
</variable>
</struct>
<typedef name="mxml_value_t"><description>An XML node value.</description><type>union
mxml_value_u</type></typedef>
<union name="mxml_value_u"><description>An XML node value.</description><variable
name="element"><type>mxml_element_t</type><description>Element</description></variable>
<variable name="integer"><type>int</type><description>Integer number</description></variable>
<variable name="opaque"><type>char *</type><description>Opaque string</description></variable>
<variable name="real"><type>double</type><description>Real number</description></variable>
<variable name="text"><type>mxml_text_t</type><description>Text fragment</description></variable>
<typedef name="mxml_value_t">
<description>An XML node value.</description>
<type>union mxml_value_u</type>
</typedef>
<union name="mxml_value_u">
<description>An XML node value.</description>
<variable name="element">
<type>mxml_element_t</type>
<description>Element</description>
</variable>
<variable name="integer">
<type>int</type>
<description>Integer number</description>
</variable>
<variable name="opaque">
<type>char *</type>
<description>Opaque string</description>
</variable>
<variable name="real">
<type>double</type>
<description>Real number</description>
</variable>
<variable name="text">
<type>mxml_text_t</type>
<description>Text fragment</description>
</variable>
</union>

73
mxmldoc.c
Unescape View File

@ -1,5 +1,5 @@
/*
* "$Id: mxmldoc.c,v 1.32 2004/05/01 07:08:14 mike Exp $"
* "$Id: mxmldoc.c,v 1.33 2004/05/01 15:20:05 mike Exp $"
*
* Documentation generator using mini-XML, a small XML-like file parsing
* library.
@ -135,7 +135,7 @@ static void update_comment(mxml_node_t *parent,
static void write_documentation(mxml_node_t *doc);
static void write_element(mxml_node_t *doc, mxml_node_t *element);
static void write_string(const char *s);
static int ws_cb(mxml_node_t *node, int where);
static const char *ws_cb(mxml_node_t *node, int where);
/*
@ -2628,27 +2628,74 @@ write_string(const char *s) /* I - String to write */
* 'ws_cb()' - Whitespace callback for saving.
*/
static int /* O - Whitespace char or 0 for none */
static const char * /* O - Whitespace string or NULL for none */
ws_cb(mxml_node_t *node, /* I - Element node */
int where) /* I - Where value */
{
const char *name; /* Name of element */
const char *name; /* Name of element */
int depth; /* Depth of node */
static const char *spaces = " ";
/* Whitespace (40 spaces) for indent */
name = node->value.element.name;
if ((!strcmp(name, "namespace") || !strcmp(name, "enumeration") ||
!strcmp(name, "typedef") || !strcmp(name, "function") ||
!strcmp(name, "variable") || !strcmp(name, "struct") ||
!strcmp(name, "class") || !strcmp(name, "constant") ||
!strcmp(name, "argument") || !strcmp(name, "returnvalue")) &&
where == MXML_WS_AFTER_CLOSE)
return ('\n');
switch (where)
{
case MXML_WS_BEFORE_CLOSE :
if (strcmp(name, "argument") &&
strcmp(name, "class") &&
strcmp(name, "constant") &&
strcmp(name, "enumeration") &&
strcmp(name, "function") &&
strcmp(name, "namespace") &&
strcmp(name, "returnvalue") &&
strcmp(name, "struct") &&
strcmp(name, "typedef") &&
strcmp(name, "union") &&
strcmp(name, "variable"))
return (NULL);
for (depth = -4; node; node = node->parent, depth += 2);
if (depth > 40)
return (spaces);
else if (depth < 2)
return (NULL);
else
return (spaces + 40 - depth);
return (0);
case MXML_WS_AFTER_CLOSE :
return ("\n");
case MXML_WS_BEFORE_OPEN :
for (depth = -4; node; node = node->parent, depth += 2);
if (depth > 40)
return (spaces);
else if (depth < 2)
return (NULL);
else
return (spaces + 40 - depth);
default :
case MXML_WS_AFTER_OPEN :
if (strcmp(name, "argument") &&
strcmp(name, "class") &&
strcmp(name, "constant") &&
strcmp(name, "enumeration") &&
strcmp(name, "function") &&
strcmp(name, "namespace") &&
strcmp(name, "returnvalue") &&
strcmp(name, "struct") &&
strcmp(name, "typedef") &&
strcmp(name, "union") &&
strcmp(name, "variable"))
return (NULL);
else
return ("\n");
}
}
/*
* End of "$Id: mxmldoc.c,v 1.32 2004/05/01 07:08:14 mike Exp $".
* End of "$Id: mxmldoc.c,v 1.33 2004/05/01 15:20:05 mike Exp $".
*/

20
testmxml.c
Unescape View File

@ -1,5 +1,5 @@
/*
* "$Id: testmxml.c,v 1.14 2004/04/06 01:47:20 mike Exp $"
* "$Id: testmxml.c,v 1.15 2004/05/01 15:20:05 mike Exp $"
*
* Test program for mini-XML, a small XML-like file parsing library.
*
@ -36,7 +36,7 @@
*/
mxml_type_t type_cb(mxml_node_t *node);
int whitespace_cb(mxml_node_t *node, int where);
const char *whitespace_cb(mxml_node_t *node, int where);
/*
@ -377,7 +377,7 @@ type_cb(mxml_node_t *node) /* I - Element node */
* newlines and tabs...
*/
int /* O - Whitespace char or 0 */
const char * /* O - Whitespace string or NULL */
whitespace_cb(mxml_node_t *node, /* I - Element node */
int where) /* I - Open or close tag? */
{
@ -400,7 +400,7 @@ whitespace_cb(mxml_node_t *node, /* I - Element node */
*/
if (where == MXML_WS_BEFORE_OPEN || where == MXML_WS_AFTER_CLOSE)
return ('\n');
return ("\n");
}
else if (!strcmp(name, "dl") || !strcmp(name, "ol") || !strcmp(name, "ul"))
{
@ -408,7 +408,7 @@ whitespace_cb(mxml_node_t *node, /* I - Element node */
* Put a newline before and after list elements...
*/
return ('\n');
return ("\n");
}
else if (!strcmp(name, "dd") || !strcmp(name, "dt") || !strcmp(name, "li"))
{
@ -417,19 +417,19 @@ whitespace_cb(mxml_node_t *node, /* I - Element node */
*/
if (where == MXML_WS_BEFORE_OPEN)
return ('\t');
return ("\t");
else if (where == MXML_WS_AFTER_CLOSE)
return ('\n');
return ("\n");
}
/*
* Return 0 for no added whitespace...
* Return NULL for no added whitespace...
*/
return (0);
return (NULL);
}
/*
* End of "$Id: testmxml.c,v 1.14 2004/04/06 01:47:20 mike Exp $".
* End of "$Id: testmxml.c,v 1.15 2004/05/01 15:20:05 mike Exp $".
*/

Write Preview
Loading…
Cancel
Save