diff options
| author | Xin Li <delphij@google.com> | 2016-07-26 14:22:54 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2016-08-15 22:30:45 +0000 |
| commit | a136fc2e5a8893a02b0912862d26a575fcbd641a (patch) | |
| tree | 341dc6790424526b424173dc7bc5a1165db7de10 /os400 | |
| parent | edb5870767fed8712a9b77ef34097209b61ab2db (diff) | |
| download | android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.tar.gz android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.tar.bz2 android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.zip | |
Merge remote-tracking branch 'goog/upstream-master' into mymerge
BUG: 29834751
Change-Id: I88fc1d4f86bcbd0ac0fe9acdbe764f3d738c5f32
(cherry picked from commit e3d78e1fe0669e9c7083a4de19f1e06171849b28)
Diffstat (limited to 'os400')
59 files changed, 3392 insertions, 1569 deletions
diff --git a/os400/README400 b/os400/README400 index 6c16de91..fff923cd 100644 --- a/os400/README400 +++ b/os400/README400 @@ -185,15 +185,27 @@ const char * xmlVasprintf(xmlDictPtr * dict, va_list args); +xmllint and xmlcatalog programs: + + These programs are fully implemented at the qshell level, with standard +command line options. Links to these are installed in sub-directory bin of +the IFS installation directory. + CL command interfaces to these programs are also provided with limited +support. In particular, interactive mode is not supported and argument count +and lengths are limited by the CL command syntax. + ILE/RPG binding: All standard types and procedures are provided. Since ILE/RPG does not -support macros, they have not been ported, with the exceptions of the more -useful ones and the global/threaded variables access macros. These variables -can be read with function get_xxx(void), where xxxx is the name of the -variable; they may be set by calling function set_xxxx(value), where value is -of the same type as the variable. +support macros, they have not been ported. However some of them are emulated +as functions: these are the more useful ones (xmlXPathNodeSetGetLength, +xmlXPathNodeSetItem, xmlXPathNodeSetIsEmpty, htmlDefaultSubelement, +htmlElementAllowedHereDesc, htmlRequiredAttrs) and the global/threaded +variables access macros. These variables can be read with function +get_xxx(void), where xxxx is the name of the variable; they may be set by +calling function set_xxxx(value), where value is of the same type as the +variable. The C va_list is not implemented as such in ILE/RPG. Functions implementing va_list and associated methods are provided: diff --git a/os400/dlfcn/dlfcn.c b/os400/dlfcn/dlfcn.c index 1488e121..77190b32 100644 --- a/os400/dlfcn/dlfcn.c +++ b/os400/dlfcn/dlfcn.c @@ -375,7 +375,7 @@ dlmakepath(char * path, size_t pathlen, const char * tail, size_t taillen) case 2: if (tail[1] != '.') break; - + pathlen = dlparentpath(path, pathlen); case 1: diff --git a/os400/initscript.sh b/os400/initscript.sh index fb805071..cc52e45e 100644 --- a/os400/initscript.sh +++ b/os400/initscript.sh @@ -165,15 +165,38 @@ action_needed() } -# make_module module_name source_name [additional_definitions] +# make_module [option] module_name source_name # # Compile source name into ASCII module if needed. # As side effect, append the module name to variable MODULES. # Set LINK to "YES" if the module has been compiled. +# Options are: +# --define <additional definitions> +# --ebcdic +# --sysiconv make_module() { + DEFN= + EBCDIC= + SYSICONV= + while true + do case "${1}" in + --define) + DEFN="${2}" + shift + ;; + --ebcdic) + EBCDIC=yes + ;; + --sysiconv) + SYSICONV=yes + ;; + *) break + esac + shift + done MODULES="${MODULES} ${1}" MODIFSNAME="${LIBIFSNAME}/${1}.MODULE" action_needed "${MODIFSNAME}" "${2}" || return 0; @@ -185,7 +208,7 @@ make_module() # the source file and we compile that temporary file. rm -f __tmpsrcf.c - if [ "${4}" != 'ebcdic' ] + if [ -z "${EBCDIC}" ] then echo "#line 1 \"${2}\"" >> __tmpsrcf.c echo "#pragma convert(819)" >> __tmpsrcf.c echo '#include "wrappers.h"' >> __tmpsrcf.c @@ -197,8 +220,10 @@ make_module() CMD="${CMD} OPTION(*INCDIRFIRST)" CMD="${CMD} SYSIFCOPT(*IFS64IO) LANGLVL(*EXTENDED) LOCALETYPE(*LOCALE)" CMD="${CMD} INCDIR(" - CMD="${CMD} '${TOPDIR}/os400/iconv'" - if [ "${4}" != 'ebcdic' ] + if [ -z "${SYSICONV}" ] + then CMD="${CMD} '${TOPDIR}/os400/iconv'" + fi + if [ -z "${EBCDIC}" ] then CMD="${CMD} '/qibm/proddata/qadrt/include'" fi CMD="${CMD} '${TOPDIR}/os400' '${TOPDIR}/os400/dlfcn'" @@ -211,7 +236,7 @@ make_module() CMD="${CMD} OUTPUT(${OUTPUT})" CMD="${CMD} OPTIMIZE(${OPTIMIZE})" CMD="${CMD} DBGVIEW(${DEBUG})" - CMD="${CMD} DEFINE('_REENTRANT' 'TRIO_HAVE_CONFIG_H' 'NDEBUG' ${3})" + CMD="${CMD} DEFINE('_REENTRANT' 'TRIO_HAVE_CONFIG_H' 'NDEBUG' ${DEFN})" system "${CMD}" rm -f __tmpsrcf.c diff --git a/os400/libxmlmain.c b/os400/libxmlmain.c new file mode 100644 index 00000000..91c848af --- /dev/null +++ b/os400/libxmlmain.c @@ -0,0 +1,102 @@ +/** +*** QADRT/QADRTMAIN2 substitution program. +*** This is needed because the IBM-provided QADRTMAIN2 does not +*** properly translate arguments by default or if no locale is provided. +*** +*** See Copyright for the status of this software. +*** +*** Author: Patrick Monnerat <pm@datasphere.ch>, DATASPHERE S.A. +**/ + +#include <stdlib.h> +#include <string.h> +#include <iconv.h> +#include <errno.h> +#include <locale.h> + +/* Do not use qadrt.h since it defines unneeded static procedures. */ +extern void QadrtInit(void); +extern int QadrtFreeConversionTable(void); +extern int QadrtFreeEnviron(void); +extern char * setlocale_a(int, const char *); + + +/* The ASCII main program. */ +extern int main_a(int argc, char * * argv); + +/* Global values of original EBCDIC arguments. */ +int ebcdic_argc; +char * * ebcdic_argv; + + +int +main(int argc, char * * argv) + +{ + int i; + int j; + iconv_t cd; + size_t bytecount = 0; + char * inbuf; + char * outbuf; + size_t inbytesleft; + size_t outbytesleft; + char dummybuf[128]; + char tocode[32]; + char fromcode[32]; + + ebcdic_argc = argc; + ebcdic_argv = argv; + + /* Build the encoding converter. */ + strncpy(tocode, "IBMCCSID01208", sizeof tocode); + strncpy(fromcode, "IBMCCSID000000000010", sizeof fromcode); + cd = iconv_open(tocode, fromcode); + + /* Measure the arguments. */ + for (i = 0; i < argc; i++) { + inbuf = argv[i]; + do { + inbytesleft = 0; + outbuf = dummybuf; + outbytesleft = sizeof dummybuf; + j = iconv(cd, + &inbuf, &inbytesleft, &outbuf, &outbytesleft); + bytecount += outbuf - dummybuf; + } while (j == -1 && errno == E2BIG); + /* Reset the shift state. */ + iconv(cd, NULL, &inbytesleft, &outbuf, &outbytesleft); + } + + /* Allocate memory for the ASCII arguments and vector. */ + argv = (char * *) malloc((argc + 1) * sizeof *argv + bytecount); + + /* Build the vector and convert argument encoding. */ + outbuf = (char *) (argv + argc + 1); + outbytesleft = bytecount; + + for (i = 0; i < argc; i++) { + argv[i] = outbuf; + inbuf = ebcdic_argv[i]; + inbytesleft = 0; + iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + iconv(cd, NULL, &inbytesleft, &outbuf, &outbytesleft); + } + + iconv_close(cd); + argv[argc] = NULL; + + /* Try setting the locale regardless of QADRT_ENV_LOCALE. */ + setlocale_a(LC_ALL, ""); + + /* Call the program. */ + i = main_a(argc, argv); + + /* Clean-up allocated items. */ + free((char *) argv); + QadrtFreeConversionTable(); + QadrtFreeEnviron(); + + /* Terminate. */ + return i; +} diff --git a/os400/libxmlrpg/DOCBparser.rpgle b/os400/libxmlrpg/DOCBparser.rpgle index bf5aaa2d..08a6b8c0 100644 --- a/os400/libxmlrpg/DOCBparser.rpgle +++ b/os400/libxmlrpg/DOCBparser.rpgle @@ -13,6 +13,7 @@ /if defined(LIBXML_DOCB_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/parser" /include "libxmlrpg/parserInternals" @@ -46,13 +47,14 @@ * There is only few public functions. d docbEncodeEntities... - d pr 10i 0 extproc('docbEncodeEntities') + d pr extproc('docbEncodeEntities') + d like(xmlCint) d out * value options(*string) unsigned char * d outlen * value int * d in * value options(*string) const unsigned char d * d inlen * value int * - d quoteChar 10i 0 value + d quoteChar value like(xmlCint) d docbSAXParseDoc... d pr extproc('docbSAXParseDoc') @@ -92,15 +94,16 @@ d sax value like(docbSAXHandlerPtr) d user_data * value void * d chunk * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d filename * value options(*string) const char * d enc value like(xmlCharEncoding) - d docbParseChunk pr 10i 0 extproc('docbParseChunk') + d docbParseChunk pr extproc('docbParseChunk') + d like(xmlCint) d ctxt value like(docbParserCtxtPtr) d chunk * value options(*string) const char * - d size 10i 0 value - d terminate 10i 0 value + d size value like(xmlCint) + d terminate value like(xmlCint) d docbCreateFileParserCtxt... d pr extproc('docbCreateFileParserCtxt') @@ -109,7 +112,8 @@ d encoding * value options(*string) const char * d docbParseDocument... - d pr 10i 0 extproc('docbParseDocument') + d pr extproc('docbParseDocument') + d like(xmlCint) d ctxt value like(docbParserCtxtPtr) /endif LIBXML_DOCB_ENABLED diff --git a/os400/libxmlrpg/HTMLparser.rpgle b/os400/libxmlrpg/HTMLparser.rpgle index d4c5f8d9..c27d8e5f 100644 --- a/os400/libxmlrpg/HTMLparser.rpgle +++ b/os400/libxmlrpg/HTMLparser.rpgle @@ -12,11 +12,12 @@ /define HTML_PARSER_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/xmlTypesC" - /include "libxmlrpg/parser" /if defined(LIBXML_HTML_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/parser" + * Most of the back-end structures from XML and HTML are shared. d htmlParserCtxtPtr... @@ -96,7 +97,7 @@ d htmlEntityDesc... d ds based(htmlEntityDescPtr) d align qualified - d value 10u 0 Unicode char value + d value like(xmlCuint) d name * const char * d desc * const char * @@ -114,15 +115,17 @@ d htmlEntityValueLookup... d pr extproc('htmlEntityValueLookup') d like(htmlEntityDescPtr) const - d value 10u 0 value + d value value like(xmlCuint) d htmlIsAutoClosed... - d pr 10i 0 extproc('htmlIsAutoClosed') + d pr extproc('htmlIsAutoClosed') + d like(xmlCint) d doc value like(htmlDocPtr) d elem value like(htmlNodePtr) d htmlAutoCloseTag... - d pr 10i 0 extproc('htmlAutoCloseTag') + d pr extproc('htmlAutoCloseTag') + d like(xmlCint) d doc value like(htmlDocPtr) d name * value options(*string) const xmlChar * d elem value like(htmlNodePtr) @@ -134,7 +137,8 @@ d str * const xmlChar *(*) d htmlParseCharRef... - d pr 10i 0 extproc('htmlParseCharRef') + d pr extproc('htmlParseCharRef') + d like(xmlCint) d ctxt value like(htmlParserCtxtPtr) d htmlParseElement... @@ -149,10 +153,11 @@ d pr extproc('htmlCreateMemoryParserCtxt') d like(htmlParserCtxtPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d htmlParseDocument... - d pr 10i 0 extproc('htmlParseDocument') + d pr extproc('htmlParseDocument') + d like(xmlCint) d ctxt value like(htmlParserCtxtPtr) d htmlSAXParseDoc... @@ -181,27 +186,31 @@ d filename * value options(*string) const char * d encoding * value options(*string) const char * - d UTF8ToHtml pr 10i 0 extproc('UTF8ToHtml') + d UTF8ToHtml pr extproc('UTF8ToHtml') + d like(xmlCint) d out 65535 options(*varsize) unsigned char [] - d outlen 10i 0 + d outlen like(xmlCint) d in * value options(*string) const unsigned char* - d inlen 10i 0 + d inlen like(xmlCint) d htmlEncodeEntities... - d pr 10i 0 extproc('htmlEncodeEntities') + d pr extproc('htmlEncodeEntities') + d like(xmlCint) d out 65535 options(*varsize) unsigned char [] - d outlen 10i 0 + d outlen like(xmlCint) d in * value options(*string) const unsigned char* - d inlen 10i 0 - d quoteChar 10i 0 value + d inlen like(xmlCint) + d quoteChar value like(xmlCint) d htmlIsScriptAttribute... - d pr 10i 0 extproc('htmlIsScriptAttribute') + d pr extproc('htmlIsScriptAttribute') + d like(xmlCint) d name * value options(*string) const xmlChar * d htmlHandleOmittedElem... - d pr 10i 0 extproc('htmlHandleOmittedElem') - d val 10i 0 value + d pr extproc('htmlHandleOmittedElem') + d like(xmlCint) + d val value like(xmlCint) /if defined(LIBXML_PUSH_ENABLED) @@ -213,15 +222,16 @@ d sax value like(htmlSAXHandlerPtr) d user_data * value void * d chunk * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d filename * value options(*string) const char * d enc value like(xmlCharEncoding) - d htmlParseChunk pr 10i 0 extproc('htmlParseChunk') + d htmlParseChunk pr extproc('htmlParseChunk') + d like(xmlCint) d ctxt value like(htmlParserCtxtPtr) d chunk * value options(*string) const char * - d size 10i 0 value - d terminate 10i 0 value + d size value like(xmlCint) + d terminate value like(xmlCint) /endif LIBXML_PUSH_ENABLED d htmlFreeParserCtxt... @@ -236,7 +246,8 @@ * to the xmlReadDoc() and similar calls. d htmlParserOption... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d HTML_PARSE_RECOVER... Relaxed parsing d c X'00000001' d HTML_PARSE_NODEFDTD... No default doctype @@ -262,37 +273,38 @@ d ctxt value like(htmlParserCtxtPtr) d htmlCtxtUseOptions... - d pr 10i 0 extproc('htmlCtxtUseOptions') + d pr extproc('htmlCtxtUseOptions') + d like(xmlCint) d ctxt value like(htmlParserCtxtPtr) - d options 10i 0 value + d options value like(xmlCint) d htmlReadDoc pr extproc('htmlReadDoc') d like(htmlDocPtr) d cur * value options(*string) const xmlChar * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlReadFile pr extproc('htmlReadFile') d like(htmlDocPtr) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlReadMemory pr extproc('htmlReadMemory') d like(htmlDocPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlReadFd pr extproc('htmlReadFd') d like(htmlDocPtr) - d fd 10i 0 value + d fd value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlReadIO pr extproc('htmlReadIO') d like(htmlDocPtr) @@ -301,7 +313,7 @@ d ioctx * value void * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlCtxtReadDoc... d pr extproc('htmlCtxtReadDoc') @@ -310,7 +322,7 @@ d cur * value options(*string) const xmlChar * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlCtxtReadFile... d pr extproc('htmlCtxtReadFile') @@ -318,25 +330,25 @@ d ctxt value like(xmlParserCtxtPtr) d filename * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlCtxtReadMemory... d pr extproc('htmlCtxtReadMemory') d like(htmlDocPtr) d ctxt value like(xmlParserCtxtPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlCtxtReadFd pr extproc('htmlCtxtReadFd') d like(htmlDocPtr) d ctxt value like(xmlParserCtxtPtr) - d fd 10i 0 value + d fd value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d htmlCtxtReadIO pr extproc('htmlCtxtReadIO') d like(htmlDocPtr) @@ -346,11 +358,12 @@ d ioctx * value void * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) * Further knowledge of HTML structure - d htmlStatus s 10i 0 based(######typedef######) enum + d htmlStatus s based(######typedef######) + d like(xmlCenum) d HTML_NA c X'0000' No check at all d HTML_INVALID c X'0001' d HTML_DEPRECATED... @@ -366,10 +379,11 @@ d like(htmlStatus) d #param1 value like(htmlElemDescPtr) const d #param2 * value options(*string) const xmlChar * - d #param3 10i 0 value + d #param3 value like(xmlCint) d htmlElementAllowedHere... - d pr 10i 0 extproc('htmlElementAllowedHere') + d pr extproc('htmlElementAllowedHere') + d like(xmlCint) d #param1 value like(htmlElemDescPtr) const d #param2 * value options(*string) const xmlChar * @@ -382,7 +396,7 @@ d htmlNodeStatus pr extproc('htmlNodeStatus') d like(htmlStatus) d #param1 value like(htmlNodePtr) - d #param2 10i 0 value + d #param2 value like(xmlCint) * C macros implemented as procedures for ILE/RPG support. @@ -391,8 +405,9 @@ d elt * value const htmlElemDesc * d htmlElementAllowedHereDesc... - d pr 10i 0 extproc( + d pr extproc( d '__htmlElementAllowedHereDesc') + d like(xmlCint) d parent * value const htmlElemDesc * d elt * value const htmlElemDesc * diff --git a/os400/libxmlrpg/HTMLtree.rpgle b/os400/libxmlrpg/HTMLtree.rpgle index 82a11ca4..99c38a0c 100644 --- a/os400/libxmlrpg/HTMLtree.rpgle +++ b/os400/libxmlrpg/HTMLtree.rpgle @@ -10,11 +10,13 @@ /define HTML_TREE_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/tree" - /include "libxmlrpg/HTMLparser" /if defined(LIBXML_HTML_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/tree" + /include "libxmlrpg/HTMLparser" + * HTML_TEXT_NODE: * * Macro. A text node in a HTML document is really implemented @@ -69,7 +71,8 @@ d doc value like(htmlDocPtr) d htmlSetMetaEncoding... - d pr 10i 0 extproc('htmlSetMetaEncoding') + d pr extproc('htmlSetMetaEncoding') + d like(xmlCint) d doc value like(htmlDocPtr) d encoding * value options(*string) const xmlChar * @@ -78,24 +81,27 @@ d pr extproc('htmlDocDumpMemory') d cur value like(xmlDocPtr) d mem * value xmlChar * * - d size 10i 0 + d size like(xmlCint) d htmlDocDumpMemoryFormat... d pr extproc('htmlDocDumpMemoryFormat') d cur value like(xmlDocPtr) d mem * value xmlChar * * - d size 10i 0 - d format 10i 0 value + d size like(xmlCint) + d format value like(xmlCint) - d htmlDocDump pr 10i 0 extproc('htmlDocDump') + d htmlDocDump pr extproc('htmlDocDump') + d like(xmlCint) d f * value FILE * d cur value like(xmlDocPtr) - d htmlSaveFile pr 10i 0 extproc('htmlSaveFile') + d htmlSaveFile pr extproc('htmlSaveFile') + d like(xmlCint) d filename * value options(*string) const char * d cur value like(xmlDocPtr) - d htmlNodeDump pr 10i 0 extproc('htmlNodeDump') + d htmlNodeDump pr extproc('htmlNodeDump') + d like(xmlCint) d buf value like(xmlBufferPtr) d doc value like(xmlDocPtr) d cur value like(xmlNodePtr) @@ -107,25 +113,28 @@ d cur value like(xmlNodePtr) d htmlNodeDumpFileFormat... - d pr 10i 0 extproc('htmlNodeDumpFileFormat') + d pr extproc('htmlNodeDumpFileFormat') + d like(xmlCint) d out * value FILE * d doc value like(xmlDocPtr) d cur value like(xmlNodePtr) d encoding * value options(*string) const char * - d format 10i 0 value + d format value like(xmlCint) d htmlSaveFileEnc... - d pr 10i 0 extproc('htmlSaveFileEnc') + d pr extproc('htmlSaveFileEnc') + d like(xmlCint) d filename * value options(*string) const char * d cur value like(xmlDocPtr) d encoding * value options(*string) const char * d htmlSaveFileFormat... - d pr 10i 0 extproc('htmlSaveFileFormat') + d pr extproc('htmlSaveFileFormat') + d like(xmlCint) d filename * value options(*string) const char * d cur value like(xmlDocPtr) d encoding * value options(*string) const char * - d format 10i 0 value + d format value like(xmlCint) d htmlNodeDumpFormatOutput... d pr extproc('htmlNodeDumpFormatOutput') @@ -133,7 +142,7 @@ d doc value like(xmlDocPtr) d cur value like(xmlNodePtr) d encoding * value options(*string) const char * - d format 10i 0 value + d format value like(xmlCint) d htmlDocContentDumpOutput... d pr extproc('htmlDocContentDumpOutput') @@ -147,7 +156,7 @@ d buf value like(xmlOutputBufferPtr) d cur value like(xmlDocPtr) d encoding * value options(*string) const char * - d format 10i 0 value + d format value like(xmlCint) d htmlNodeDumpOutput... d pr extproc('htmlNodeDumpOutput') @@ -159,7 +168,8 @@ /endif LIBXML_OUTPUT_ENABLD d htmlIsBooleanAttr... - d pr 10i 0 extproc('htmlIsBooleanAttr') + d pr extproc('htmlIsBooleanAttr') + d like(xmlCint) d name * value options(*string) const xmlChar * /endif LIBXML_HTML_ENABLED diff --git a/os400/libxmlrpg/SAX.rpgle b/os400/libxmlrpg/SAX.rpgle index 85f15ccf..a22d49ae 100644 --- a/os400/libxmlrpg/SAX.rpgle +++ b/os400/libxmlrpg/SAX.rpgle @@ -26,22 +26,27 @@ d ctx * value void * d loc value like(xmlSAXLocatorPtr) - d getLineNumber pr 10i 0 extproc('getLineNumber') + d getLineNumber pr extproc('getLineNumber') + d like(xmlCint) d ctx * value void * d getColumnNumber... - d pr 10i 0 extproc('getColumnNumber') + d pr extproc('getColumnNumber') + d like(xmlCint) d ctx * value void * - d isStandalone pr 10i 0 extproc('isStandalone') + d isStandalone pr extproc('isStandalone') + d like(xmlCint) d ctx * value void * d hasInternalSubset... - d pr 10i 0 extproc('hasInternalSubset') + d pr extproc('hasInternalSubset') + d like(xmlCint) d ctx * value void * d hasExternalSubset... - d pr 10i 0 extproc('hasExternalSubset') + d pr extproc('hasExternalSubset') + d like(xmlCint) d ctx * value void * d internalSubset pr extproc('internalSubset') @@ -76,7 +81,7 @@ d entityDecl pr extproc('entityDecl') d ctx * value void * d name * value options(*string) const xmlChar * - d type 10i 0 value + d type value like(xmlCint) d publicId * value options(*string) const xmlChar * d systemId * value options(*string) const xmlChar * d content * value options(*string) xmlChar * @@ -85,15 +90,15 @@ d ctx * value void * d elem * value options(*string) const xmlChar * d fullname * value options(*string) const xmlChar * - d type 10i 0 value - d def 10i 0 value + d type value like(xmlCint) + d def value like(xmlCint) d defaultValue * value options(*string) const xmlChar * d tree value like(xmlEnumerationPtr) d elementDecl pr extproc('elementDecl') d ctx * value void * d name * value options(*string) const xmlChar * - d type 10i 0 value + d type value like(xmlCint) d content value like(xmlElementContentPtr) d notationDecl pr extproc('notationDecl') @@ -137,13 +142,13 @@ d characters pr extproc('characters') d ctx * value void * d ch * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d ignorableWhitespace... d pr extproc('ignorableWhitespace') d ctx * value void * d ch * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d processingInstruction... d pr extproc('processingInstruction') @@ -165,7 +170,8 @@ d like(xmlNsPtr) d ctx * value void * - d checkNamespace pr 10i 0 extproc('checkNamespace') + d checkNamespace pr extproc('checkNamespace') + d like(xmlCint) d ctx * value void * d nameSpace * value options(*string) xmlChar * @@ -181,13 +187,13 @@ d cdataBlock pr extproc('cdataBlock') d ctx * value void * d value * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) /if defined(LIBXML_SAX1_ENABLED) d initxmlDefaultSAXHandler... d pr extproc('initxmlDefaultSAXHandler') d hdlr likeds(xmlSAXHandlerV1) - d warning 10i 0 value + d warning value like(xmlCint) /if defined(LIBXML_HTML_ENABLED) d inithtmlDefaultSAXHandler... diff --git a/os400/libxmlrpg/SAX2.rpgle b/os400/libxmlrpg/SAX2.rpgle index fb687e99..c72be259 100644 --- a/os400/libxmlrpg/SAX2.rpgle +++ b/os400/libxmlrpg/SAX2.rpgle @@ -10,6 +10,7 @@ /define XML_SAX2_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/parser" /include "libxmlrpg/xlink" @@ -27,23 +28,28 @@ d loc value like(xmlSAXLocatorPtr) d xmlSAX2GetLineNumber... - d pr 10i 0 extproc('xmlSAX2GetLineNumber') + d pr extproc('xmlSAX2GetLineNumber') + d like(xmlCint) d ctx * value void * d xmlSAX2GetColumnNumber... - d pr 10i 0 extproc('xmlSAX2GetColumnNumber') + d pr extproc('xmlSAX2GetColumnNumber') + d like(xmlCint) d ctx * value void * d xmlSAX2IsStandalone... - d pr 10i 0 extproc('xmlSAX2IsStandalone') + d pr extproc('xmlSAX2IsStandalone') + d like(xmlCint) d ctx * value void * d xmlSAX2HasInternalSubset... - d pr 10i 0 extproc('xmlSAX2HasInternalSubset') + d pr extproc('xmlSAX2HasInternalSubset') + d like(xmlCint) d ctx * value void * d xmlSAX2HasExternalSubset... - d pr 10i 0 extproc('xmlSAX2HasExternalSubset') + d pr extproc('xmlSAX2HasExternalSubset') + d like(xmlCint) d ctx * value void * d xmlSAX2InternalSubset... @@ -83,7 +89,7 @@ d pr extproc('xmlSAX2EntityDecl') d ctx * value void * d name * value options(*string) const xmlChar * - d type 10i 0 value + d type value like(xmlCint) d publicId * value options(*string) const xmlChar * d systemId * value options(*string) const xmlChar * d content * value options(*string) xmlChar * @@ -93,8 +99,8 @@ d ctx * value void * d elem * value options(*string) const xmlChar * d fullname * value options(*string) const xmlChar * - d type 10i 0 value - d def 10i 0 value + d type value like(xmlCint) + d def value like(xmlCint) d defaultValue * value options(*string) const xmlChar * d tree value like(xmlEnumerationPtr) @@ -102,7 +108,7 @@ d pr extproc('xmlSAX2ElementDecl') d ctx * value void * d name * value options(*string) const xmlChar * - d type 10i 0 value + d type value like(xmlCint) d content value like(xmlElementContentPtr) d xmlSAX2NotationDecl... @@ -158,10 +164,10 @@ d localname * value options(*string) const xmlChar * d prefix * value options(*string) const xmlChar * d URI * value options(*string) const xmlChar * - d nb_namespaces 10i 0 value + d nb_namespaces value like(xmlCint) d namespaces * value const xmlChar *(*) - d nb_attributes 10i 0 value - d nb_defaulted 10i 0 value + d nb_attributes value like(xmlCint) + d nb_defaulted value like(xmlCint) d attributes * const xmlChar *(*) d xmlSAX2EndElementNs... @@ -180,13 +186,13 @@ d pr extproc('xmlSAX2Characters') d ctx * value void * d ch * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlSAX2IgnorableWhitespace... d pr extproc('xmlSAX2IgnorableWhitespace') d ctx * value void * d ch * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlSAX2ProcessingInstruction... d pr extproc( @@ -204,23 +210,25 @@ d pr extproc('xmlSAX2CDataBlock') d ctx * value void * d value * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) /if defined(LIBXML_SAX1_ENABLED) d xmlSAXDefaultVersion... - d pr 10i 0 extproc('xmlSAXDefaultVersion') - d version 10i 0 value + d pr extproc('xmlSAXDefaultVersion') + d like(xmlCint) + d version value like(xmlCint) /endif LIBXML_SAX1_ENABLED - d xmlSAXVersion pr 10i 0 extproc('xmlSAXVersion') + d xmlSAXVersion pr extproc('xmlSAXVersion') + d like(xmlCint) d hdlr likeds(xmlSAXHandler) - d version 10i 0 value + d version value like(xmlCint) d xmlSAX2InitDefaultSAXHandler... d pr extproc( d 'xmlSAX2InitDefaultSAXHandler') d hdlr likeds(xmlSAXHandler) - d warning 10i 0 value + d warning value like(xmlCint) /if defined(LIBXML_HTML_ENABLED) d xmlSAX2InitHtmlDefaultSAXHandler... diff --git a/os400/libxmlrpg/c14n.rpgle b/os400/libxmlrpg/c14n.rpgle index b64efb28..963ed374 100644 --- a/os400/libxmlrpg/c14n.rpgle +++ b/os400/libxmlrpg/c14n.rpgle @@ -21,6 +21,7 @@ /if defined(LIBXML_C14N_ENABLED) /if defined(LIBXML_OUTPUT_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/tree" /include "libxmlrpg/xpath" @@ -52,41 +53,45 @@ * Predefined values for C14N modes d xmlBufferAllocationScheme... - d xmlC14NMode s 10i 0 based(######typedef######) enum + d xmlC14NMode s based(######typedef######) + d like(xmlCenum) d XML_C14N_1_0 c 0 Original C14N 1.0 d XML_C14N_EXCLUSIVE_1_0... Exclusive C14N 1.0 d c 1 d XML_C14N_1_1 c 2 C14N 1.1 spec d xmlC14NDocSaveTo... - d pr 10i 0 extproc('xmlC14NDocSaveTo') + d pr extproc('xmlC14NDocSaveTo') + d like(xmlCint) d doc value like(xmlDocPtr) d nodes value like(xmlNodeSetPtr) - d mode 10i 0 value + d mode value like(xmlCint) d inclusive_ns_prefixes... - d * xmlChar *(*) - d with_comments 10i 0 value + d * options(*omit) xmlChar *(*) + d with_comments value like(xmlCint) d buf value like(xmlOutputBufferPtr) d xmlC14NDocDumpMemory... - d pr 10i 0 extproc('xmlC14NDocDumpMemory') + d pr extproc('xmlC14NDocDumpMemory') + d like(xmlCint) d doc value like(xmlDocPtr) d nodes value like(xmlNodeSetPtr) - d mode 10i 0 value + d mode value like(xmlCint) d inclusive_ns_prefixes... - d * xmlChar *(*) - d with_comments 10i 0 value + d * options(*omit) xmlChar *(*) + d with_comments value like(xmlCint) d doc_txt_ptr * xmlChar *(*) - d xmlC14NDocSave pr 10i 0 extproc('xmlC14NDocSave') + d xmlC14NDocSave pr extproc('xmlC14NDocSave') + d like(xmlCint) d doc value like(xmlDocPtr) d nodes value like(xmlNodeSetPtr) - d mode 10i 0 value + d mode value like(xmlCint) d inclusive_ns_prefixes... - d * xmlChar *(*) - d with_comments 10i 0 value + d * options(*omit) xmlChar *(*) + d with_comments value like(xmlCint) d filename * value options(*string) const char * - d compression 10i 0 value + d compression value like(xmlCint) * This is the core C14N function @@ -103,15 +108,16 @@ d s * based(######typedef######) d procptr - d xmlC14NExecute pr 10i 0 extproc('xmlC14NExecute') + d xmlC14NExecute pr extproc('xmlC14NExecute') + d like(xmlCint) d doc value like(xmlDocPtr) d is_visible_callback... d value like(xmlC14NIsVisibleCallback) d user_data * value void * - d mode 10i 0 value + d mode value like(xmlCint) d inclusive_ns_prefixes... - d * xmlChar *(*) - d with_comments 10i 0 value + d * options(*omit) xmlChar *(*) + d with_comments value like(xmlCint) d buf value like(xmlOutputBufferPtr) /endif LIBXML_OUTPUT_ENABLD diff --git a/os400/libxmlrpg/catalog.rpgle b/os400/libxmlrpg/catalog.rpgle index 52baf4e9..1dab819d 100644 --- a/os400/libxmlrpg/catalog.rpgle +++ b/os400/libxmlrpg/catalog.rpgle @@ -16,11 +16,13 @@ /define XML_CATALOG_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/xmlstring" - /include "libxmlrpg/tree" /if defined(LIBXML_CATALOG_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/xmlstring" + /include "libxmlrpg/tree" + * XML_CATALOGS_NAMESPACE: * * The namespace for the XML Catalogs elements. @@ -38,7 +40,8 @@ * The API is voluntarily limited to general cataloging. d xmlCatalogPrefer... - d s 10u 0 based(######typedef######) enum type + d s based(######typedef######) + d like(xmlCenum) d XML_CATA_PREFER_NONE... d c 0 d XML_CATA_PREFER_PUBLIC... @@ -47,7 +50,8 @@ d c 2 d xmlCatalogAllow... - d s 10u 0 based(######typedef######) enum type + d s based(######typedef######) + d like(xmlCenum) d XML_CATA_ALLOW_NONE... d c 0 d XML_CATA_ALLOW_GLOBAL... @@ -63,7 +67,7 @@ d xmlNewCatalog pr extproc('xmlNewCatalog') d like(xmlCatalogPtr) - d sgml 10i 0 value + d sgml value like(xmlCint) d xmlLoadACatalog... d pr extproc('xmlLoadACatalog') @@ -76,17 +80,20 @@ d filename * value options(*string) const char * d xmlConvertSGMLCatalog... - d pr 10i 0 extproc('xmlConvertSGMLCatalog') + d pr extproc('xmlConvertSGMLCatalog') + d like(xmlCint) d catal value like(xmlCatalogPtr) - d xmlACatalogAdd pr 10i 0 extproc('xmlACatalogAdd') + d xmlACatalogAdd pr extproc('xmlACatalogAdd') + d like(xmlCint) d catal value like(xmlCatalogPtr) d type * value options(*string) const xmlChar * d orig * value options(*string) const xmlChar * d replace * value options(*string) const xmlChar * d xmlACatalogRemove... - d pr 10i 0 extproc('xmlACatalogRemove') + d pr extproc('xmlACatalogRemove') + d like(xmlCint) d catal value like(xmlCatalogPtr) d value * value options(*string) const xmlChar * @@ -122,7 +129,8 @@ d catal value like(xmlCatalogPtr) d xmlCatalogIsEmpty... - d pr 10i 0 extproc('xmlCatalogIsEmpty') + d pr extproc('xmlCatalogIsEmpty') + d like(xmlCint) d catal value like(xmlCatalogPtr) * Global operations. @@ -130,7 +138,8 @@ d xmlInitializeCatalog... d pr extproc('xmlInitializeCatalog') - d xmlLoadCatalog pr 10i 0 extproc('xmlLoadCatalog') + d xmlLoadCatalog pr extproc('xmlLoadCatalog') + d like(xmlCint) d filename * value options(*string) const char * d xmlLoadCatalogs... @@ -162,13 +171,15 @@ d pr * extproc('xmlCatalogResolveURI') xmlChar * d URI * value options(*string) const xmlChar * - d xmlCatalogAdd pr 10i 0 extproc('xmlCatalogAdd') + d xmlCatalogAdd pr extproc('xmlCatalogAdd') + d like(xmlCint) d type * value options(*string) const xmlChar * d orig * value options(*string) const xmlChar * d replace * value options(*string) const xmlChar * d xmlCatalogRemove... - d pr 10i 0 extproc('xmlCatalogRemove') + d pr extproc('xmlCatalogRemove') + d like(xmlCint) d value * value options(*string) const xmlChar * d xmlParseCatalogFile... @@ -177,7 +188,8 @@ d filename * value options(*string) const char * d xmlCatalogConvert... - d pr 10i 0 extproc('xmlCatalogConvert') + d pr extproc('xmlCatalogConvert') + d like(xmlCint) * Strictly minimal interfaces for per-document catalogs used * by the parser. @@ -205,8 +217,9 @@ * Preference settings. d xmlCatalogSetDebug... - d pr 10i 0 extproc('xmlCatalogSetDebug') - d level 10i 0 value + d pr extproc('xmlCatalogSetDebug') + d like(xmlCint) + d level value like(xmlCint) d xmlCatalogSetDefaultPrefer... d pr extproc('xmlCatalogSetDefaultPrefer') diff --git a/os400/libxmlrpg/chvalid.rpgle b/os400/libxmlrpg/chvalid.rpgle index 444d1cb2..c601442f 100644 --- a/os400/libxmlrpg/chvalid.rpgle +++ b/os400/libxmlrpg/chvalid.rpgle @@ -26,8 +26,8 @@ d xmlChLRange ds based(xmlChLRangePtr) d align qualified - d low 10u 0 - d high 10u 0 + d low like(xmlCuint) + d high like(xmlCuint) d xmlChRangeGroupPtr... d s * based(######typedef######) @@ -35,15 +35,16 @@ d xmlChRangeGroup... d ds based(xmlChRangeGroupPtr) d align qualified - d nbShortRange 10i 0 - d nbLongRange 10i 0 + d nbShortRange like(xmlCint) + d nbLongRange like(xmlCint) d shortRange like(xmlChSRangePtr) d longRange like(xmlChLRangePtr) * Range checking routine - d xmlCharInRange pr 10i 0 extproc('xmlCharInRange') - d val 10u 0 value + d xmlCharInRange pr extproc('xmlCharInRange') + d like(xmlCint) + d val value like(xmlCuint) d group like(xmlChRangeGroupPtr) const d xmlIsBaseCharGroup... @@ -70,29 +71,37 @@ d ds import('xmlIsIdeographicGroup') d likeds(xmlChRangeGroup) const - d xmlIsBaseChar pr 10i 0 extproc('xmlIsBaseChar') - d ch 10u 0 value + d xmlIsBaseChar pr extproc('xmlIsBaseChar') + d like(xmlCint) + d ch value like(xmlCuint) - d xmlIsBlank pr 10i 0 extproc('xmlIsBlank') - d ch 10u 0 value + d xmlIsBlank pr extproc('xmlIsBlank') + d like(xmlCint) + d ch value like(xmlCuint) - d xmlIsChar pr 10i 0 extproc('xmlIsChar') - d ch 10u 0 value + d xmlIsChar pr extproc('xmlIsChar') + d like(xmlCint) + d ch value like(xmlCuint) - d xmlIsCombining pr 10i 0 extproc('xmlIsCombining') - d ch 10u 0 value + d xmlIsCombining pr extproc('xmlIsCombining') + d like(xmlCint) + d ch value like(xmlCuint) - d xmlIsDigit pr 10i 0 extproc('xmlIsDigit') - d ch 10u 0 value + d xmlIsDigit pr extproc('xmlIsDigit') + d like(xmlCint) + d ch value like(xmlCuint) - d xmlIsExtender pr 10i 0 extproc('xmlIsExtender') - d ch 10u 0 value + d xmlIsExtender pr extproc('xmlIsExtender') + d like(xmlCint) + d ch value like(xmlCuint) d xmlIsIdeographic... - d pr 10i 0 extproc('xmlIsIdeographic') - d ch 10u 0 value + d pr extproc('xmlIsIdeographic') + d like(xmlCint) + d ch value like(xmlCuint) - d xmlIsPubidChar pr 10i 0 extproc('xmlIsPubidChar') - d ch 10u 0 value + d xmlIsPubidChar pr extproc('xmlIsPubidChar') + d like(xmlCint) + d ch value like(xmlCuint) /endif XML_CHVALID_H__ diff --git a/os400/libxmlrpg/debugXML.rpgle b/os400/libxmlrpg/debugXML.rpgle index 5005a2d4..81826bcf 100644 --- a/os400/libxmlrpg/debugXML.rpgle +++ b/os400/libxmlrpg/debugXML.rpgle @@ -10,10 +10,11 @@ /define DEBUG_XML__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/tree" /if defined(LIBXML_DEBUG_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/tree" /include "libxmlrpg/xpath" * The standard Dump routines. @@ -27,31 +28,31 @@ d pr extproc('xmlDebugDumpAttr') d output * value FILE * d attr value like(xmlAttrPtr) - d depth 10i 0 value + d depth value like(xmlCint) d xmlDebugDumpAttrList... d pr extproc('xmlDebugDumpAttrList') d output * value FILE * d attr value like(xmlAttrPtr) - d depth 10i 0 value + d depth value like(xmlCint) d xmlDebugDumpOneNode... d pr extproc('xmlDebugDumpOneNode') d output * value FILE * d node value like(xmlNodePtr) - d depth 10i 0 value + d depth value like(xmlCint) d xmlDebugDumpNode... d pr extproc('xmlDebugDumpNode') d output * value FILE * d node value like(xmlNodePtr) - d depth 10i 0 value + d depth value like(xmlCint) d xmlDebugDumpNodeList... d pr extproc('xmlDebugDumpNodeList') d output * value FILE * d node value like(xmlNodePtr) - d depth 10i 0 value + d depth value like(xmlCint) d xmlDebugDumpDocumentHead... d pr extproc('xmlDebugDumpDocumentHead') @@ -80,7 +81,8 @@ **************************************************************** d xmlDebugCheckDocument... - d pr 10i 0 extproc('xmlDebugCheckDocument') + d pr extproc('xmlDebugCheckDocument') + d like(xmlCint) d output * value FILE * d doc value like(xmlDocPtr) @@ -94,11 +96,12 @@ d output * value FILE * d node value like(xmlNodePtr) - d xmlLsCountNode pr 10i 0 extproc('xmlLsCountNode') + d xmlLsCountNode pr extproc('xmlLsCountNode') + d like(xmlCint) d node value like(xmlNodePtr) d xmlBoolToText pr * extproc('xmlBoolToText') const char * - d boolval 10i 0 value + d boolval value like(xmlCint) **************************************************************** * * @@ -133,7 +136,7 @@ d doc like(xmlDocPtr) d node like(xmlNodePtr) d pctxt like(xmlXPathContextPtr) - d loaded 10i 0 + d loaded like(xmlCint) d output * FILE * d input like(xmlShellReadlineFunc) @@ -152,32 +155,36 @@ d xmlShellPrintXPathError... d pr extproc('xmlShellPrintXPathError') - d errorType 10i 0 value + d errorType value like(xmlCint) d arg * value options(*string) const char * d xmlShellPrintXPathResult... d pr extproc('xmlShellPrintXPathResult') d list value like(xmlXPathObjectPtr) - d xmlShellList pr 10i 0 extproc('xmlShellList') + d xmlShellList pr extproc('xmlShellList') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d arg * value options(*string) char * d node value like(xmlNodePtr) d node2 value like(xmlNodePtr) - d xmlShellBase pr 10i 0 extproc('xmlShellBase') + d xmlShellBase pr extproc('xmlShellBase') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d arg * value options(*string) char * d node value like(xmlNodePtr) d node2 value like(xmlNodePtr) - d xmlShellDir pr 10i 0 extproc('xmlShellDir') + d xmlShellDir pr extproc('xmlShellDir') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d arg * value options(*string) char * d node value like(xmlNodePtr) d node2 value like(xmlNodePtr) - d xmlShellLoad pr 10i 0 extproc('xmlShellLoad') + d xmlShellLoad pr extproc('xmlShellLoad') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d filename * value options(*string) char * d node value like(xmlNodePtr) @@ -188,19 +195,22 @@ d pr extproc('xmlShellPrintNode') d node value like(xmlNodePtr) - d xmlShellCat pr 10i 0 extproc('xmlShellCat') + d xmlShellCat pr extproc('xmlShellCat') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d arg * value options(*string) char * d node value like(xmlNodePtr) d node2 value like(xmlNodePtr) - d xmlShellWrite pr 10i 0 extproc('xmlShellWrite') + d xmlShellWrite pr extproc('xmlShellWrite') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d filename * value options(*string) char * d node value like(xmlNodePtr) d node2 value like(xmlNodePtr) - d xmlShellSave pr 10i 0 extproc('xmlShellSave') + d xmlShellSave pr extproc('xmlShellSave') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d filename * value options(*string) char * d node value like(xmlNodePtr) @@ -209,20 +219,23 @@ /if defined(LIBXML_VALID_ENABLED) d xmlShellValidate... - d pr 10i 0 extproc('xmlShellValidate') + d pr extproc('xmlShellValidate') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d dtd * value options(*string) char * d node value like(xmlNodePtr) d node2 value like(xmlNodePtr) /endif LIBXML_VALID_ENABLED - d xmlShellDu pr 10i 0 extproc('xmlShellDu') + d xmlShellDu pr extproc('xmlShellDu') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d arg * value options(*string) char * d tree value like(xmlNodePtr) d node2 value like(xmlNodePtr) - d xmlShellPwd pr 10i 0 extproc('xmlShellPwd') + d xmlShellPwd pr extproc('xmlShellPwd') + d like(xmlCint) d ctxt value like(xmlShellCtxtPtr) d buffer * value options(*string) char * d node value like(xmlNodePtr) diff --git a/os400/libxmlrpg/dict.rpgle b/os400/libxmlrpg/dict.rpgle index bcb6576e..c061e4c8 100644 --- a/os400/libxmlrpg/dict.rpgle +++ b/os400/libxmlrpg/dict.rpgle @@ -9,18 +9,19 @@ /if not defined(XML_DICT_H__) /define XML_DICT_H__ - /include "libxmlrpg/xmlversion" - /include "libxmlrpg/xmlTypesC" - /include "libxmlrpg/tree" - * The dictionary. d xmlDictPtr s * based(######typedef######) + /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/tree" + * Initializer d xmlInitializeDict... - d pr 10i 0 extproc('xmlInitializeDict') + d pr extproc('xmlInitializeDict') + d like(xmlCint) * Constructor and destructor. @@ -44,7 +45,8 @@ d sub value like(xmlDictPtr) d xmlDictReference... - d pr 10i 0 extproc('xmlDictGetReference') + d pr extproc('xmlDictGetReference') + d like(xmlCint) d dict value like(xmlDictPtr) d xmlDictFree pr extproc('xmlDictFree') @@ -55,23 +57,25 @@ d xmlDictLookup pr * extproc('xmlDictLookup') const xmlChar * d dict value like(xmlDictPtr) d name * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlDictExists pr * extproc('xmlDictExists') const xmlChar * d dict value like(xmlDictPtr) d name * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlDictQLookup pr * extproc('xmlDictQLookup') const xmlChar * d dict value like(xmlDictPtr) d name * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * - d xmlDictOwns pr 10i 0 extproc('xmlDictOwns') + d xmlDictOwns pr extproc('xmlDictOwns') + d like(xmlCint) d dict value like(xmlDictPtr) d str * value options(*string) const xmlChar * - d xmlDictSize pr 10i 0 extproc('xmlDictSize') + d xmlDictSize pr extproc('xmlDictSize') + d like(xmlCint) d dict value like(xmlDictPtr) * Cleanup function diff --git a/os400/libxmlrpg/encoding.rpgle b/os400/libxmlrpg/encoding.rpgle index c0ed7e65..8153f3ca 100644 --- a/os400/libxmlrpg/encoding.rpgle +++ b/os400/libxmlrpg/encoding.rpgle @@ -21,6 +21,7 @@ /define XML_CHAR_ENCODING_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" * xmlCharEncoding: * @@ -43,7 +44,8 @@ * the specific UTF-16LE and UTF-16BE are present. d xmlCharEncoding... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_CHAR_ENCODING_ERROR... No encoding detected d c -1 d XML_CHAR_ENCODING_NONE... No encoding detected @@ -200,12 +202,14 @@ * Interfaces for encoding names and aliases. d xmlAddEncodingAlias... - d pr 10i 0 extproc('xmlAddEncodingAlias') + d pr extproc('xmlAddEncodingAlias') + d like(xmlCint) d name * value options(*string) const char * d alias * value options(*string) const char * d xmlDelEncodingAlias... - d pr 10i 0 extproc('xmlDelEncodingAlias') + d pr extproc('xmlDelEncodingAlias') + d like(xmlCint) d alias * value options(*string) const char * d xmlGetEncodingAlias... @@ -230,45 +234,51 @@ d pr extproc('xmlDetectCharEncoding') d like(xmlCharEncoding) d in * value options(*string) const unsigned char* - d len 10i 0 value + d len value like(xmlCint) d xmlCharEncOutFunc... - d pr 10i 0 extproc('xmlCharEncOutFunc') + d pr extproc('xmlCharEncOutFunc') + d like(xmlCint) d handler likeds(xmlCharEncodingHandler) d out value like(xmlBufferPtr) d in value like(xmlBufferPtr) d xmlCharEncInFunc... - d pr 10i 0 extproc('xmlCharEncInFunc') + d pr extproc('xmlCharEncInFunc') + d like(xmlCint) d handler likeds(xmlCharEncodingHandler) d out value like(xmlBufferPtr) d in value like(xmlBufferPtr) d xmlCharEncFirstLine... - d pr 10i 0 extproc('xmlCharEncFirstLine') + d pr extproc('xmlCharEncFirstLine') + d like(xmlCint) d handler likeds(xmlCharEncodingHandler) d out value like(xmlBufferPtr) d in value like(xmlBufferPtr) d xmlCharEncCloseFunc... - d pr 10i 0 extproc('xmlCharEncCloseFunc') + d pr extproc('xmlCharEncCloseFunc') + d like(xmlCint) d handler likeds(xmlCharEncodingHandler) * Export a few useful functions /if defined(LIBXML_OUTPUT_ENABLED) - d UTF8Toisolat1 pr 10i 0 extproc('UTF8Toisolat1') + d UTF8Toisolat1 pr extproc('UTF8Toisolat1') + d like(xmlCint) d out 65535 options(*varsize) unsigned char (*) - d outlen 10i 0 + d outlen like(xmlCint) d in * value options(*string) const unsigned char* - d inlen 10i 0 + d inlen like(xmlCint) /endif LIBXML_OUTPUT_ENABLD - d isolat1ToUTF8 pr 10i 0 extproc('isolat1ToUTF8') + d isolat1ToUTF8 pr extproc('isolat1ToUTF8') + d like(xmlCint) d out 65535 options(*varsize) unsigned char (*) - d outlen 10i 0 + d outlen like(xmlCint) d in * value options(*string) const unsigned char* - d inlen 10i 0 + d inlen like(xmlCint) /endif XML_CHAR_ENCODING_H diff --git a/os400/libxmlrpg/entities.rpgle b/os400/libxmlrpg/entities.rpgle index 8d97915a..eeec1b6d 100644 --- a/os400/libxmlrpg/entities.rpgle +++ b/os400/libxmlrpg/entities.rpgle @@ -10,11 +10,13 @@ /define XML_ENTITIES_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/tree" * The different valid entity types. - d xmlEntityType s 10i 0 based(######typedef######) enum + d xmlEntityType s based(######typedef######) + d like(xmlCenum) d XML_INTERNAL_GENERAL_ENTITY... d c 1 d XML_EXTERNAL_GENERAL_PARSED_ENTITY... @@ -44,14 +46,14 @@ d doc like(xmlDocPtr) containing document d orig * xmlChar * d content * xmlChar * - d length 10i 0 content length + d length like(xmlCint) content length d etype like(xmlEntityType) The entity type d ExternalID * const xmlChar * d SystemlID * const xmlChar * d nexte like(xmlEntityPtr) unused d URI * const xmlChar * - d owner 10i 0 Owns children ? - d checked 10i 0 Content checked ? + d owner like(xmlCint) Owns children ? + d checked like(xmlCint) Content checked ? * All entities are stored in an hash table. * There is 2 separate hash tables for global and parameter entities. @@ -71,7 +73,7 @@ d like(xmlEntityPtr) d doc value like(xmlDocPtr) d name * value options(*string) const xmlChar * - d type 10i 0 value + d type value like(xmlCint) d ExternalID * value options(*string) const xmlChar * d SystemID * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * @@ -81,7 +83,7 @@ d like(xmlEntityPtr) d doc value like(xmlDocPtr) d name * value options(*string) const xmlChar * - d type 10i 0 value + d type value like(xmlCint) d ExternalID * value options(*string) const xmlChar * d SystemID * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * @@ -91,7 +93,7 @@ d like(xmlEntityPtr) d doc value like(xmlDocPtr) d name * value options(*string) const xmlChar * - d type 10i 0 value + d type value like(xmlCint) d ExternalID * value options(*string) const xmlChar * d SystemID * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * diff --git a/os400/libxmlrpg/globals.rpgle b/os400/libxmlrpg/globals.rpgle index e51182fb..3fe3a9bc 100644 --- a/os400/libxmlrpg/globals.rpgle +++ b/os400/libxmlrpg/globals.rpgle @@ -13,6 +13,7 @@ /define XML_GLOBALS_H /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/parser" /include "libxmlrpg/xmlerror" /include "libxmlrpg/SAX" @@ -112,31 +113,31 @@ d xmlGenericErrorContext... d * void * d oldXMLWDcompatibility... - d 10i 0 + d like(xmlCint) d xmlBufferAllocScheme... d like(xmlBufferAllocationScheme) d xmlDefaultBufferSize... - d 10i 0 + d like(xmlCint) d xmlSubstituteEntitiesDefaultValue... - d 10i 0 + d like(xmlCint) d xmlDoValidityCheckingDefaultValue... - d 10i 0 + d like(xmlCint) d xmlGetWarningsDefaultValue... - d 10i 0 + d like(xmlCint) d xmlKeepBlanksDefaultValue... - d 10i 0 + d like(xmlCint) d xmlLineNumbersDefaultValue... - d 10i 0 + d like(xmlCint) d xmlLoadExtDtdDefaultValue... - d 10i 0 + d like(xmlCint) d xmlParserDebugEntities... - d 10i 0 + d like(xmlCint) d xmlPedanticParserDefaultValue... - d 10i 0 + d like(xmlCint) d xmlSaveNoEmptyTags... - d 10i 0 + d like(xmlCint) d xmlIndentTreeOutput... - d 10i 0 + d like(xmlCint) d xmlTreeIndentString... d * const char * d xmlRegisterNodeDefaultValue... @@ -244,13 +245,14 @@ d value value likeds(xmlError) d get_oldXMLWDcompatibility... - d pr 10i 0 extproc( + d pr extproc( d '__get_oldXMLWDcompatibility') + d like(xmlCint) d set_oldXMLWDcompatibility... d pr extproc( d '__set_oldXMLWDcompatibility') - d value 10i 0 value + d value value like(xmlCint) d get_xmlBufferAllocScheme... d pr extproc('__get_xmlBufferAllocScheme') @@ -266,15 +268,17 @@ d v value like(xmlBufferAllocationScheme) d get_xmlDefaultBufferSize... - d pr 10i 0 extproc('__get_xmlDefaultBufferSize') + d pr extproc('__get_xmlDefaultBufferSize') + d like(xmlCint) d set_xmlDefaultBufferSize... d pr extproc('__set_xmlDefaultBufferSize') - d value 10i 0 value + d value value like(xmlCint) d xmlThrDefDefaultBufferSize... - d pr 10i 0 extproc('xmlThrDefDefaultBufferSize') - d v 10i 0 value + d pr extproc('xmlThrDefDefaultBufferSize') + d like(xmlCint) + d v value like(xmlCint) d get_xmlDefaultSAXHandler... d pr extproc('__get_xmlDefaultSAXHandler') @@ -293,18 +297,20 @@ d value value likeds(xmlSAXLocator) d get_xmlDoValidityCheckingDefaultValue... - d pr 10i 0 extproc('__get_xmlDoValidity+ + d pr extproc('__get_xmlDoValidity+ d CheckingDefaultValue') + d like(xmlCint) d set_xmlDoValidityCheckingDefaultValue... d pr extproc('__set_xmlDoValidity+ d CheckingDefaultValue') - d value 10i 0 value - + d value value like(xmlCint) + d xmlThrDefDoValidityCheckingDefaultValue... - d pr 10i 0 extproc('xmlThrDefDoValidity+ + d pr extproc('xmlThrDefDoValidity+ d CheckingDefaultValue') - d v 10i 0 value + d like(xmlCint) + d v value like(xmlCint) d get_xmlGenericError... d pr extproc('__get_xmlGenericError') @@ -325,7 +331,7 @@ d xmlStructuredError... d pr extproc('__call_xmlStructuredError') d userData * value options(*string) void * - d error value like(xmlErrorPtr) + d error value like(xmlErrorPtr) d get_xmlGenericErrorContext... d pr extproc( @@ -348,29 +354,33 @@ d value * value options(*string) void * d get_xmlGetWarningsDefaultValue... - d pr 10i 0 extproc( + d pr extproc( d '__get_xmlGetWarningsDefaultValue') + d like(xmlCint) d set_xmlGetWarningsDefaultValue... d pr extproc( d '__set_xmlGetWarningsDefaultValue') - d value 10i 0 value + d value value like(xmlCint) d xmlThrDefGetWarningsDefaultValue... - d pr 10i 0 extproc( + d pr extproc( d 'xmlThrDefGetWarningsDefaultValue') - d v 10i 0 value + d like(xmlCint) + d v value like(xmlCint) d get_xmlIndentTreeOutput... - d pr 10i 0 extproc('__get_xmlIndentTreeOutput') + d pr extproc('__get_xmlIndentTreeOutput') + d like(xmlCint) d set_xmlIndentTreeOutput... - d pr extproc('__set_xmlIndentTreeOutput') - d value 10i 0 value + d pr extproc('__set_xmlIndentTreeOutput') + d value value like(xmlCint) d xmlThrDefIndentTreeOutput... - d pr 10i 0 extproc('xmlThrDefIndentTreeOutput') - d v 10i 0 value + d pr extproc('xmlThrDefIndentTreeOutput') + d like(xmlCint) + d v value like(xmlCint) d get_xmlTreeIndentString... d pr * extproc('__get_xmlTreeIndentString') const char * @@ -378,66 +388,74 @@ d set_xmlTreeIndentString... d pr extproc('__set_xmlTreeIndentString') d value * value options(*string) const char * - + d xmlThrDefTreeIndentString... d pr * extproc('xmlThrDefTreeIndentString') const char * d v * value options(*string) const char * d get_xmlKeepBlanksDefaultValue... - d pr 10i 0 extproc( - d '__get_xmlKeepBlanksDefaultValue') + d pr extproc( + d '__get_xmlKeepBlanksDefaultValue') + d like(xmlCint) d set_xmlKeepBlanksDefaultValue... d pr extproc( - d '__set_xmlKeepBlanksDefaultValue') - d value 10i 0 value + d '__set_xmlKeepBlanksDefaultValue') + d value value like(xmlCint) d xmlThrDefKeepBlanksDefaultValue... - d pr 10i 0 extproc( + d pr extproc( d 'xmlThrDefKeepBlanksDefaultValue') - d v 10i 0 value + d like(xmlCint) + d v value like(xmlCint) d get_xmlLineNumbersDefaultValue... - d pr 10i 0 extproc( + d pr extproc( d '__get_xmlLineNumbersDefaultValue') + d like(xmlCint) d set_xmlLineNumbersDefaultValue... d pr extproc( d '__set_xmlLineNumbersDefaultValue') - d value 10i 0 value + d value value like(xmlCint) d xmlThrDefLineNumbersDefaultValue... - d pr 10i 0 extproc( + d pr extproc( d 'xmlThrDefLineNumbersDefaultValue') - d v 10i 0 value + d like(xmlCint) + d v value like(xmlCint) d get_xmlLoadExtDtdDefaultValue... - d pr 10i 0 extproc( + d pr extproc( d '__get_xmlLoadExtDtdDefaultValue') + d like(xmlCint) d set_xmlLoadExtDtdDefaultValue... d pr extproc( d '__set_xmlLoadExtDtdDefaultValue') - d value 10i 0 value + d value value like(xmlCint) d xmlThrDefLoadExtDtdDefaultValue... - d pr 10i 0 extproc( + d pr extproc( d 'xmlThrDefLoadExtDtdDefaultValue') - d v 10i 0 value + d like(xmlCint) + d v value like(xmlCint) d get_xmlParserDebugEntities... - d pr 10i 0 extproc( + d pr extproc( d '__get_xmlParserDebugEntities') + d like(xmlCint) d set_xmlParserDebugEntities... d pr extproc( d '__set_xmlParserDebugEntities') - d value 10i 0 value + d value value like(xmlCint) d xmlThrDefParserDebugEntities... - d pr 10i 0 extproc( + d pr extproc( d 'xmlThrDefParserDebugEntities') - d v 10i 0 value + d like(xmlCint) + d v value like(xmlCint) d get_xmlParserVersion... d pr * extproc('__get_xmlParserVersion') const char * @@ -447,43 +465,49 @@ d value * value options(*string) const char * d get_xmlPedanticParserDefaultValue... - d pr 10i 0 extproc('__get_xmlPedantic+ + d pr extproc('__get_xmlPedantic+ d ParserDefaultValue') + d like(xmlCint) d set_xmlPedanticParserDefaultValue... d pr extproc('__set_xmlPedantic+ d ParserDefaultValue') - d value 10i 0 value + d value value like(xmlCint) d xmlThrDefPedanticParserDefaultValue... - d pr 10i 0 extproc('xmlThrDefPedantic+ + d pr extproc('xmlThrDefPedantic+ d ParserDefaultValue') - d v 10i 0 value + d like(xmlCint) + d v value like(xmlCint) d get_xmlSaveNoEmptyTags... - d pr 10i 0 extproc('__get_xmlSaveNoEmptyTags') + d pr extproc('__get_xmlSaveNoEmptyTags') + d like(xmlCint) d set_xmlSaveNoEmptyTags... d pr extproc('__set_xmlSaveNoEmptyTags') - d value 10i 0 value + d value value like(xmlCint) d xmlThrDefSaveNoEmptyTags... - d pr 10i 0 extproc('xmlThrDefSaveNoEmptyTags') - d v 10i 0 value + d pr extproc('xmlThrDefSaveNoEmptyTags') + d like(xmlCint) + d v value like(xmlCint) d get_xmlSubstituteEntitiesDefaultValue... - d pr 10i 0 extproc('__get_xmlSubstitute+ + d pr extproc('__get_xmlSubstitute+ d EntitiesDefaultValue') + d like(xmlCint) d set_xmlSubstituteEntitiesDefaultValue... d pr extproc('__set_xmlSubstitute+ d EntitiesDefaultValue') - d value 10i 0 value + d value value like(xmlCint) d xmlThrDefSubstituteEntitiesDefaultValue... - d pr 10i 0 extproc('xmlThrDefSubstitute+ + d pr extproc('xmlThrDefSubstitute+ d EntitiesDefaultValue') - d v 10i 0 value + d like(xmlCint) + d v value like(xmlCint) d get_xmlRegisterNodeDefaultValue... d pr extproc('__get_xmlRegisterNode+ @@ -552,6 +576,6 @@ d like(xmlOutputBufferPtr) d URI * value options(*string) const char * d encoder value like(xmlCharEncodingHandlerPtr) - d compression 10i 0 value + d compression value like(xmlCint) /endif XML_GLOBALS_H diff --git a/os400/libxmlrpg/hash.rpgle b/os400/libxmlrpg/hash.rpgle index 867f98f6..b2169dfe 100644 --- a/os400/libxmlrpg/hash.rpgle +++ b/os400/libxmlrpg/hash.rpgle @@ -9,6 +9,8 @@ /if not defined(XML_HASH_H__) /define XML_HASH_H__ + /include "libxmlrpg/xmlTypesC" + * The hash table. d xmlHashTablePtr... @@ -68,12 +70,12 @@ d xmlHashCreate pr extproc('xmlHashCreate') d like(xmlHashTablePtr) - d size 10i 0 value + d size value like(xmlCint) d xmlHashCreateDict... d pr extproc('xmlHashCreateDict') d like(xmlHashTablePtr) - d size 10i 0 value + d size value like(xmlCint) d dict value like(xmlDictPtr) d xmlHashFree pr extproc('xmlHashFree') @@ -83,27 +85,31 @@ * Add a new entry to the hash table. d xmlHashAddEntry... - d pr 10i 0 extproc('xmlHashAddEntry') + d pr extproc('xmlHashAddEntry') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d userdata * value options(*string) void * d xmlHashUpdateEntry... - d pr 10i 0 extproc('xmlHashUpdateEntry') + d pr extproc('xmlHashUpdateEntry') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d userdata * value options(*string) void * d f value like(xmlHashDeallocator) d xmlHashAddEntry2... - d pr 10i 0 extproc('xmlHashAddEntry2') + d pr extproc('xmlHashAddEntry2') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d name2 * value options(*string) const xmlChar * d userdata * value options(*string) void * d xmlHashUpdateEntry2... - d pr 10i 0 extproc('xmlHashUpdateEntry2') + d pr extproc('xmlHashUpdateEntry2') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d name2 * value options(*string) const xmlChar * @@ -111,7 +117,8 @@ d f value like(xmlHashDeallocator) d xmlHashAddEntry3... - d pr 10i 0 extproc('xmlHashAddEntry3') + d pr extproc('xmlHashAddEntry3') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d name2 * value options(*string) const xmlChar * @@ -119,7 +126,8 @@ d userdata * value options(*string) void * d xmlHashUpdateEntry3... - d pr 10i 0 extproc('xmlHashUpdateEntry3') + d pr extproc('xmlHashUpdateEntry3') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d name2 * value options(*string) const xmlChar * @@ -130,20 +138,23 @@ * Remove an entry from the hash table. d xmlHashRemoveEntry... - d pr 10i 0 extproc('xmlHashRemoveEntry') + d pr extproc('xmlHashRemoveEntry') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d f value like(xmlHashDeallocator) d xmlHashRemoveEntry2... - d pr 10i 0 extproc('xmlHashRemoveEntry2') + d pr extproc('xmlHashRemoveEntry2') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d name2 * value options(*string) const xmlChar * d f value like(xmlHashDeallocator) d xmlHashRemoveEntry3... - d pr 10i 0 extproc('xmlHashRemoveEntry3') + d pr extproc('xmlHashRemoveEntry3') + d like(xmlCint) d table value like(xmlHashTablePtr) d name * value options(*string) const xmlChar * d name2 * value options(*string) const xmlChar * @@ -197,7 +208,8 @@ d table value like(xmlHashTablePtr) d f value like(xmlHashCopier) - d xmlHashSize pr 10i 0 extproc('xmlHashSize') + d xmlHashSize pr extproc('xmlHashSize') + d like(xmlCint) d table value like(xmlHashTablePtr) d xmlHashScan pr extproc('xmlHashScan') diff --git a/os400/libxmlrpg/list.rpgle b/os400/libxmlrpg/list.rpgle index c62fcbd1..ce2fa1c1 100644 --- a/os400/libxmlrpg/list.rpgle +++ b/os400/libxmlrpg/list.rpgle @@ -10,6 +10,7 @@ /define XML_LINK_INCLUDE__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" d xmlLinkPtr s * based(######typedef######) @@ -68,33 +69,39 @@ d l value like(xmlListPtr) d data * value void * - d xmlListInsert pr 10i 0 extproc('xmlListInsert') + d xmlListInsert pr extproc('xmlListInsert') + d like(xmlCint) d l value like(xmlListPtr) d data * value void * - d xmlListAppend pr 10i 0 extproc('xmlListAppend') + d xmlListAppend pr extproc('xmlListAppend') + d like(xmlCint) d l value like(xmlListPtr) d data * value void * d xmlListRemoveFirst... - d pr 10i 0 extproc('xmlListRemoveFirst') + d pr extproc('xmlListRemoveFirst') + d like(xmlCint) d l value like(xmlListPtr) d data * value void * d xmlListRemoveLast... - d pr 10i 0 extproc('xmlListRemoveLast') + d pr extproc('xmlListRemoveLast') + d like(xmlCint) d l value like(xmlListPtr) d data * value void * d xmlListRemoveAll... - d pr 10i 0 extproc('xmlListRemoveAll') + d pr extproc('xmlListRemoveAll') + d like(xmlCint) d l value like(xmlListPtr) d data * value void * d xmlListClear pr extproc('xmlListClear') d l value like(xmlListPtr) - d xmlListEmpty pr 10i 0 extproc('xmlListEmpty') + d xmlListEmpty pr extproc('xmlListEmpty') + d like(xmlCint) d l value like(xmlListPtr) d xmlListFront pr extproc('xmlListFront') @@ -105,7 +112,8 @@ d like(xmlLinkPtr) d l value like(xmlListPtr) - d xmlListSize pr 10i 0 extproc('xmlListSize') + d xmlListSize pr extproc('xmlListSize') + d like(xmlCint) d l value like(xmlListPtr) d xmlListPopFront... @@ -117,12 +125,14 @@ d l value like(xmlListPtr) d xmlListPushFront... - d pr 10i 0 extproc('xmlListPushFront') + d pr extproc('xmlListPushFront') + d like(xmlCint) d l value like(xmlListPtr) d data * value void * d xmlListPushBack... - d pr 10i 0 extproc('xmlListPushBack') + d pr extproc('xmlListPushBack') + d like(xmlCint) d l value like(xmlListPtr) d data * value void * @@ -153,7 +163,8 @@ d like(xmlListPtr) d old value like(xmlListPtr) - d xmlListCopy pr 10i 0 extproc('xmlListCopy') + d xmlListCopy pr extproc('xmlListCopy') + d like(xmlCint) d cur value like(xmlListPtr) d old value like(xmlListPtr) const diff --git a/os400/libxmlrpg/nanoftp.rpgle b/os400/libxmlrpg/nanoftp.rpgle index d8d5ef97..ac4f2aaf 100644 --- a/os400/libxmlrpg/nanoftp.rpgle +++ b/os400/libxmlrpg/nanoftp.rpgle @@ -13,6 +13,8 @@ /if defined(LIBXML_FTP_ENABLED) + /include "libxmlrpg/xmlTypesC" + d INVALID_SOCKET c -1 * ftpListCallback: @@ -67,7 +69,7 @@ d xmlNanoFTPConnectTo... d pr * extproc('xmlNanoFTPConnectTo') void * d server * value options(*string) const char * - d port 10i 0 value + d port value like(xmlCint) * Opening/closing session connections. @@ -75,14 +77,17 @@ d URL * value options(*string) const char * d xmlNanoFTPConnect... - d pr 10i 0 extproc('xmlNanoFTPConnect') + d pr extproc('xmlNanoFTPConnect') + d like(xmlCint) d ctx * value void * d xmlNanoFTPClose... - d pr 10i 0 extproc('xmlNanoFTPClose') + d pr extproc('xmlNanoFTPClose') + d like(xmlCint) d ctx * value void * - d xmlNanoFTPQuit pr 10i 0 extproc('xmlNanoFTPQuit') + d xmlNanoFTPQuit pr extproc('xmlNanoFTPQuit') + d like(xmlCint) d ctx * value void * d xmlNanoFTPScanProxy... @@ -92,65 +97,76 @@ d xmlNanoFTPProxy... d pr extproc('xmlNanoFTPProxy') d host * value options(*string) const char * - d port 10i 0 value + d port value like(xmlCint) d user * value options(*string) const char * d passwd * value options(*string) const char * - d type 10i 0 value + d type value like(xmlCint) d xmlNanoFTPUpdateURL... - d pr 10i 0 extproc('xmlNanoFTPUpdateURL') + d pr extproc('xmlNanoFTPUpdateURL') + d like(xmlCint) d ctx * value void * d URL * value options(*string) const char * * Rather internal commands. d xmlNanoFTPGetResponse... - d pr 10i 0 extproc('xmlNanoFTPGetResponse') + d pr extproc('xmlNanoFTPGetResponse') + d like(xmlCint) d ctx * value void * d xmlNanoFTPCheckResponse... - d pr 10i 0 extproc('xmlNanoFTPCheckResponse') + d pr extproc('xmlNanoFTPCheckResponse') + d like(xmlCint) d ctx * value void * * CD/DIR/GET handlers. - d xmlNanoFTPCwd pr 10i 0 extproc('xmlNanoFTPCwd') + d xmlNanoFTPCwd pr extproc('xmlNanoFTPCwd') + d like(xmlCint) d ctx * value void * d directory * value options(*string) const char * - d xmlNanoFTPDele pr 10i 0 extproc('xmlNanoFTPDele') + d xmlNanoFTPDele pr extproc('xmlNanoFTPDele') + d like(xmlCint) d ctx * value void * d file * value options(*string) const char * d xmlNanoFTPGetConnection... - d pr 10i 0 extproc('xmlNanoFTPGetConnection') Socket descriptor + d pr extproc('xmlNanoFTPGetConnection') Socket descriptor + d like(xmlCint) d ctx * value void * d xmlNanoFTPCloseConnection... - d pr 10i 0 extproc('xmlNanoFTPCloseConnection') + d pr extproc('xmlNanoFTPCloseConnection') + d like(xmlCint) d ctx * value void * - d xmlNanoFTPList pr 10i 0 extproc('xmlNanoFTPList') + d xmlNanoFTPList pr extproc('xmlNanoFTPList') + d like(xmlCint) d ctx * value void * d callback value like(ftpListCallback) d userData * value void * d filename * value options(*string) const char * d xmlNanoFTPGetSocket... - d pr 10i 0 extproc('xmlNanoFTPGetSocket') Socket descriptor + d pr extproc('xmlNanoFTPGetSocket') Socket descriptor + d like(xmlCint) d ctx * value void * d filename * value options(*string) const char * - d xmlNanoFTPGet pr 10i 0 extproc('xmlNanoFTPGet') + d xmlNanoFTPGet pr extproc('xmlNanoFTPGet') + d like(xmlCint) d ctx * value void * d callback value like(ftpDataCallback) d userData * value void * d filename * value options(*string) const char * - d xmlNanoFTPRead pr 10i 0 extproc('xmlNanoFTPRead') + d xmlNanoFTPRead pr extproc('xmlNanoFTPRead') + d like(xmlCint) d ctx * value void * d dest * value void * - d len 10i 0 value + d len value like(xmlCint) /endif LIBXML_FTP_ENABLED /endif NANO_FTP_H__ diff --git a/os400/libxmlrpg/nanohttp.rpgle b/os400/libxmlrpg/nanohttp.rpgle index 4a076d2b..d4e6008f 100644 --- a/os400/libxmlrpg/nanohttp.rpgle +++ b/os400/libxmlrpg/nanohttp.rpgle @@ -13,6 +13,8 @@ /if defined(LIBXML_HTTP_ENABLED) + /include "libxmlrpg/xmlTypesC" + d xmlNanoHTTPInit... d pr extproc('xmlNanoHTTPInit') @@ -24,7 +26,8 @@ d URL * value options(*string) const char * d xmlNanoHTTPFetch... - d pr 10i 0 extproc('xmlNanoHTTPFetch') + d pr extproc('xmlNanoHTTPFetch') + d like(xmlCint) d URL * value options(*string) const char * d filename * value options(*string) const char * @@ -35,7 +38,7 @@ d input * value options(*string) const char * d contentType * value char * * d headers * value options(*string) const char * - d ilen 10i 0 value + d ilen value like(xmlCint) d xmlNanoHTTPMethodRedir... d pr * extproc('xmlNanoHTTPMethodRedir') void * @@ -45,7 +48,7 @@ d contentType * value char * * d redir * value char * * d headers * value options(*string) const char * - d ilen 10i 0 value + d ilen value like(xmlCint) d xmlNanoHTTPOpen... d pr * extproc('xmlNanoHTTPOpen') void * @@ -59,7 +62,8 @@ d redir * value char * * d xmlNanoHTTPReturnCode... - d pr 10i 0 extproc('xmlNanoHTTPReturnCode') + d pr extproc('xmlNanoHTTPReturnCode') + d like(xmlCint) d ctx * value void * d xmlNanoHTTPAuthHeader... @@ -71,7 +75,8 @@ d ctx * value void * d xmlNanoHTTPContentLength... - d pr 10i 0 extproc('xmlNanoHTTPContentLength') + d pr extproc('xmlNanoHTTPContentLength') + d like(xmlCint) d ctx * value void * d xmlNanoHTTPEncoding... @@ -83,14 +88,16 @@ d ctx * value void * d xmlNanoHTTPRead... - d pr 10i 0 extproc('xmlNanoHTTPRead') + d pr extproc('xmlNanoHTTPRead') + d like(xmlCint) d ctx * value void * d dest * value void * - d len 10i 0 value + d len value like(xmlCint) /if defined(LIBXML_OUTPUT_ENABLED) d xmlNanoHTTPSave... - d pr 10i 0 extproc('xmlNanoHTTPSave') + d pr extproc('xmlNanoHTTPSave') + d like(xmlCint) d ctxt * value void * d filename * value options(*string) const char * /endif LIBXML_OUTPUT_ENABLD diff --git a/os400/libxmlrpg/parser.rpgle b/os400/libxmlrpg/parser.rpgle index f04aa2eb..fa48d4f3 100644 --- a/os400/libxmlrpg/parser.rpgle +++ b/os400/libxmlrpg/parser.rpgle @@ -53,9 +53,9 @@ d base * const char * d cur * const char * d end * const char * - d length 10i 0 Length if known - d line 10i 0 Current line - d col 10i 0 Current column + d length like(xmlCint) Length if known + d line like(xmlCint) Current line + d col like(xmlCint) Current column * * NOTE: consumed is only tested for equality in the parser code, * so even if there is an overflow this should not give troubles @@ -65,8 +65,8 @@ d free like(xmlParserInputDeallocate) base deallocator d encoding * const xmlChar * d version * const xmlChar * - d standalone 10i 0 Standalone entity ? - d id 10i 0 Entity unique ID + d standalone like(xmlCint) Standalone entity ? + d id like(xmlCint) Entity unique ID * xmlParserNodeInfo: * @@ -103,7 +103,8 @@ * The recursive one use the state info for entities processing. d xmlParserInputState... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_PARSER_EOF... Nothing to parse d c -1 d XML_PARSER_START... Nothing parsed @@ -168,7 +169,8 @@ * * A parser can operate in various modes - d xmlParserMode s 10i 0 based(######typedef######) enum + d xmlParserMode s based(######typedef######) + d like(xmlCenum) d XML_PARSE_UNKNOWN... d c 0 d XML_PARSE_DOM... @@ -199,59 +201,59 @@ d sax like(xmlSAXHandlerPtr) The SAX handler d userData * SAX only-4 DOM build d myDoc like(xmlDocPtr) Document being built - d wellFormed 10i 0 Well formed doc ? + d wellFormed like(xmlCint) Well formed doc ? d replaceEntities... Replace entities ? - d 10i 0 + d like(xmlCint) d version * const xmlChar * d encoding * const xmlChar * - d standalone 10i 0 Standalone document - d html 10i 0 HTML state/type + d standalone like(xmlCint) Standalone document + d html like(xmlCint) HTML state/type * * Input stream stack * d input like(xmlParserInputPtr) Current input stream - d inputNr 10i 0 # current in streams - d inputMax 10i 0 Max # of in streams + d inputNr like(xmlCint) # current in streams + d inputMax like(xmlCint) Max # of in streams d inputTab * xmlParserInputPtr * * * Node analysis stack only used for DOM building * d node like(xmlNodePtr) Current parsed node - d nodeNr 10i 0 Parsing stack depth - d nodeMax 10i 0 Max stack depth + d nodeNr like(xmlCint) Parsing stack depth + d nodeMax like(xmlCint) Max stack depth d nodeTab * xmlNodePtr * * - d record_info 10i 0 Keep node info ? + d record_info like(xmlCint) Keep node info ? d node_seq likeds(xmlParserNodeInfoSeq) Parsed nodes info * - d errNo 10i 0 Error code + d errNo like(xmlCint) Error code * d hasExternalSubset... - d 10i 0 - d hasPErefs 10i 0 - d external 10i 0 Parsing ext. entity? + d like(xmlCint) + d hasPErefs like(xmlCint) + d external like(xmlCint) Parsing ext. entity? * - d valid 10i 0 Valid document ? - d validate 10i 0 Try to validate ? + d valid like(xmlCint) Valid document ? + d validate like(xmlCint) Try to validate ? d vctxt likeds(xmlValidCtxt) Validity context * d instate like(xmlParserInputState) Current input type - d token 10i 0 Next look-ahead char + d token like(xmlCint) Next look-ahead char * d directory * char * * * Node name stack * d name * const xmlChar * - d nameNr 10i 0 Parsing stack depth - d nameMax 10i 0 Max stack depth + d nameNr like(xmlCint) Parsing stack depth + d nameMax like(xmlCint) Max stack depth d nameTab * const xmlChar * * * d nbChars like(xmlClong) # xmlChars processed d checkIndex like(xmlClong) 4 progressive parse - d keepBlanks 10i 0 Ugly but ... - d disableSAX 10i 0 Disable SAX cllbacks - d inSubset 10i 0 In int 1/ext 2 sbset + d keepBlanks like(xmlCint) Ugly but ... + d disableSAX like(xmlCint) Disable SAX cllbacks + d inSubset like(xmlCint) In int 1/ext 2 sbset d intSubName * const xmlChar * d extSubURI * const xmlChar * d extSubSytem * const xmlChar * @@ -259,27 +261,27 @@ * xml:space values * d space * int * - d spaceNr 10i 0 Parsing stack depth - d spaceMax 10i 0 Max stack depth + d spaceNr like(xmlCint) Parsing stack depth + d spaceMax like(xmlCint) Max stack depth d spaceTab * int * * - d depth 10i 0 To detect loops + d depth like(xmlCint) To detect loops d entity like(xmlParserInputPtr) To check boundaries - d charset 10i 0 In-memory content - d nodelen 10i 0 Speed up parsing - d nodemem 10i 0 Speed up parsing - d pedantic 10i 0 Enb. pedantic warng + d charset like(xmlCint) In-memory content + d nodelen like(xmlCint) Speed up parsing + d nodemem like(xmlCint) Speed up parsing + d pedantic like(xmlCint) Enb. pedantic warng d #private * void * * - d loadsubset 10i 0 Load ext. subset ? - d linenumbers 10i 0 Set line numbers ? + d loadsubset like(xmlCint) Load ext. subset ? + d linenumbers like(xmlCint) Set line numbers ? d catalogs * void * - d recovery 10i 0 Run in recovery mode - d progressive 10i 0 Progressive parsing? + d recovery like(xmlCint) Run in recovery mode + d progressive like(xmlCint) Progressive parsing? d dict like(xmlDictPtr) Parser dictionary d atts * const xmlChar * - d maxatts 10i 0 Above array size - d docdict 10i 0 Use dictionary ? + d maxatts like(xmlCint) Above array size + d docdict like(xmlCint) Use dictionary ? * * pre-interned strings * @@ -289,23 +291,23 @@ * * Everything below is used only by the new SAX mode * - d sax2 10i 0 New SAX mode ? - d nsNr 10i 0 # inherited nmspaces - d nsMax 10i 0 Array size + d sax2 like(xmlCint) New SAX mode ? + d nsNr like(xmlCint) # inherited nmspaces + d nsMax like(xmlCint) Array size d nsTab * const xmlChar * d attallocs * int * d pushTab * void * d attsDefault like(xmlHashTablePtr) Defaulted attrs d attsSpecial like(xmlHashTablePtr) non-CDATA attrs - d nsWellFormed 10i 0 Doc namespace OK ? - d options 10i 0 Extra options + d nsWellFormed like(xmlCint) Doc namespace OK ? + d options like(xmlCint) Extra options * * Those fields are needed only for treaming parsing so far * - d dictNames 10i 0 Dict names in tree ? - d freeElemsNr 10i 0 # free element nodes + d dictNames like(xmlCint) Dict names in tree ? + d freeElemsNr like(xmlCint) # free element nodes d freeElems like(xmlNodePtr) Free elem nodes list - d freeAttrsNr 10i 0 # free attr. nodes + d freeAttrsNr like(xmlCint) # free attr. nodes d freeAttrs like(xmlAttrPtr) Free attr noes list * * the complete error informations for the last error. @@ -318,11 +320,11 @@ * for use by HTML non-recursive parser * d nodeInfo like(xmlParserNodeInfoPtr) Current NodeInfo - d nodeInfoNr 10i 0 Parsing stack depth - d nodeInfoMax 10i 0 Max stack depth + d nodeInfoNr like(xmlCint) Parsing stack depth + d nodeInfoMax like(xmlCint) Max stack depth d nodeInfoTab * xmlParserNodeInfo * * - d input_id 10i 0 Label inputs ? + d input_id like(xmlCint) Label inputs ? d sizeentcopy like(xmlCulong) Entity copy volume * xmlSAXLocator: @@ -756,7 +758,7 @@ d cdataBlock like(cdataBlockSAXFunc) d externalSubset... d like(externalSubsetSAXFunc) - d initialized 10u 0 + d initialized like(xmlCuint) * * The following fields are extensions available only on version 2 * @@ -810,7 +812,7 @@ d cdataBlock like(cdataBlockSAXFunc) d externalSubset... d like(externalSubsetSAXFunc) - d initialized 10u 0 + d initialized like(xmlCuint) * xmlExternalEntityLoader: * @URL: The System ID of the resource requested @@ -839,14 +841,16 @@ * Input functions d xmlParserInputRead... - d pr 10i 0 extproc('xmlParserInputRead') + d pr extproc('xmlParserInputRead') + d like(xmlCint) d in value like(xmlParserInputPtr) - d len 10i 0 value + d len value like(xmlCint) d xmlParserInputGrow... - d pr 10i 0 extproc('xmlParserInputGrow') + d pr extproc('xmlParserInputGrow') + d like(xmlCint) d in value like(xmlParserInputPtr) - d len 10i 0 value + d len value like(xmlCint) * Basic parsing Interfaces @@ -862,28 +866,32 @@ d xmlParseMemory pr extproc('xmlParseMemory') d like(xmlDocPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) /endif LIBXML_SAX1_ENABLED d xmlSubstituteEntitiesDefault... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSubstituteEntitiesDefault') - d val 10i 0 value + d like(xmlCint) + d val value like(xmlCint) d xmlKeepBlanksDefault... - d pr 10i 0 extproc('xmlKeepBlanksDefault') - d val 10i 0 value + d pr extproc('xmlKeepBlanksDefault') + d like(xmlCint) + d val value like(xmlCint) d xmlStopParser pr extproc('xmlStopParser') d ctxt value like(xmlParserCtxtPtr) d xmlPedanticParserDefault... - d pr 10i 0 extproc('xmlPedanticParserDefault') - d val 10i 0 value + d pr extproc('xmlPedanticParserDefault') + d like(xmlCint) + d val value like(xmlCint) d xmlLineNumbersDefault... - d pr 10i 0 extproc('xmlLineNumbersDefault') - d val 10i 0 value + d pr extproc('xmlLineNumbersDefault') + d like(xmlCint) + d val value like(xmlCint) /if defined(LIBXML_SAX1_ENABLED) * Recovery mode @@ -896,7 +904,7 @@ d pr extproc('xmlRecoverMemory') d like(xmlDocPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d xmlRecoverFile pr extproc('xmlRecoverFile') d like(xmlDocPtr) @@ -906,48 +914,52 @@ * Less common routines and SAX interfaces d xmlParseDocument... - d pr 10i 0 extproc('xmlParseDocument') + d pr extproc('xmlParseDocument') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d xmlParseExtParsedEnt... - d pr 10i 0 extproc('xmlParseExtParsedEnt') + d pr extproc('xmlParseExtParsedEnt') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) /if defined(LIBXML_SAX1_ENABLED) d xmlSAXUserParseFile... - d pr 10i 0 extproc('xmlSAXUserParseFile') + d pr extproc('xmlSAXUserParseFile') + d like(xmlCint) d sax value like(xmlSAXHandlerPtr) d user_data * value void * d filename * value options(*string) const char * d xmlSAXUserParseMemory... - d pr 10i 0 extproc('xmlSAXUserParseMemory') + d pr extproc('xmlSAXUserParseMemory') + d like(xmlCint) d sax value like(xmlSAXHandlerPtr) d user_data * value void * d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d xmlSAXParseDoc pr extproc('xmlSAXParseDoc') d like(xmlDocPtr) d sax value like(xmlSAXHandlerPtr) d cur * value options(*string) const xmlChar * - d recovery 10i 0 value + d recovery value like(xmlCint) d xmlSAXParseMemory... d pr extproc('xmlSAXParseMemory') d like(xmlDocPtr) d sax value like(xmlSAXHandlerPtr) d buffer * value options(*string) const char * - d size 10i 0 value - d recovery 10i 0 value + d size value like(xmlCint) + d recovery value like(xmlCint) d xmlSAXParseMemoryWithData... d pr extproc('xmlSAXParseMemoryWithData') d like(xmlDocPtr) d sax value like(xmlSAXHandlerPtr) d buffer * value options(*string) const char * - d size 10i 0 value - d recovery 10i 0 value + d size value like(xmlCint) + d recovery value like(xmlCint) d data * value void * d xmlSAXParseFile... @@ -955,14 +967,14 @@ d like(xmlDocPtr) d sax value like(xmlSAXHandlerPtr) d filename * value options(*string) const char * - d recovery 10i 0 value + d recovery value like(xmlCint) d xmlSAXParseFileWithData... d pr extproc('xmlSAXParseFileWithData') d like(xmlDocPtr) d sax value like(xmlSAXHandlerPtr) d filename * value options(*string) const char * - d recovery 10i 0 value + d recovery value like(xmlCint) d data * value void * d xmlSAXParseEntity... @@ -998,12 +1010,13 @@ /if defined(LIBXML_SAX1_ENABLED) d xmlParseBalancedChunkMemory... - d pr 10i 0 extproc( + d pr extproc( d 'xmlParseBalancedChunkMemory') + d like(xmlCint) d doc value like(xmlDocPtr) d sax value like(xmlSAXHandlerPtr) d user_data * value void * - d depth 10i 0 value + d depth value like(xmlCint) d user_data * value void * d string * value options(*string) const xmlChar * d lst * value xmlNodePtr * @@ -1014,35 +1027,38 @@ d like(xmlParserErrors) d node value like(xmlNodePtr) d data * value options(*string) const char * - d datalen 10i 0 value - d options 10i 0 value + d datalen value like(xmlCint) + d options value like(xmlCint) d lst * value xmlNodePtr * /if defined(LIBXML_SAX1_ENABLED) d xmlParseBalancedChunkMemoryRecover... - d pr 10i 0 extproc( + d pr extproc( d 'xmlParseBalancedChunkMemoryRecover') + d like(xmlCint) d doc value like(xmlDocPtr) d sax value like(xmlSAXHandlerPtr) d user_data * value void * - d depth 10i 0 value + d depth value like(xmlCint) d string * value options(*string) const xmlChar * d lst * value xmlNodePtr * - d recover 10i 0 value + d recover value like(xmlCint) d xmlParseExternalEntity... - d pr 10i 0 extproc('xmlParseExternalEntity') + d pr extproc('xmlParseExternalEntity') + d like(xmlCint) d doc value like(xmlDocPtr) d sax value like(xmlSAXHandlerPtr) d user_data * value void * - d depth 10i 0 value + d depth value like(xmlCint) d URL * value options(*string) const xmlChar * d ID * value options(*string) const xmlChar * d lst * value xmlNodePtr * /endif LIBXML_SAX1_ENABLED d xmlParseCtxtExternalEntity... - d pr 10i 0 extproc('xmlParseCtxtExternalEntity') + d pr extproc('xmlParseCtxtExternalEntity') + d like(xmlCint) d sax value like(xmlSAXHandlerPtr) d URL * value options(*string) const xmlChar * d ID * value options(*string) const xmlChar * @@ -1055,7 +1071,8 @@ d like(xmlParserCtxtPtr) d xmlInitParserCtxt... - d pr 10i 0 extproc('xmlInitParserCtxt') + d pr extproc('xmlInitParserCtxt') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d xmlClearParserCtxt... @@ -1083,16 +1100,19 @@ * Reading/setting optional parsing features. d xmlGetFeaturesList... - d pr 10i 0 extproc('xmlGetFeaturesList') - d len 10i 0 + d pr extproc('xmlGetFeaturesList') + d like(xmlCint) + d len like(xmlCint) d result * const char *(*) - d xmlGetFeature pr 10i 0 extproc('xmlGetFeature') + d xmlGetFeature pr extproc('xmlGetFeature') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d name * value options(*string) const char * d result * value void * - d xmlSetFeature pr 10i 0 extproc('xmlSetFeature') + d xmlSetFeature pr extproc('xmlSetFeature') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d name * value options(*string) const char * d result * value void * @@ -1107,14 +1127,15 @@ d sax value like(xmlSAXHandlerPtr) d user_data * value void * d chunk * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d filename * value options(*string) const char * - d xmlParseChunk pr 10i 0 extproc('xmlParseChunk') + d xmlParseChunk pr extproc('xmlParseChunk') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d chunk * value options(*string) const char * - d size 10i 0 value - d terminate 10i 0 value + d size value like(xmlCint) + d terminate value like(xmlCint) /endif LIBXML_PUSH_ENABLED * Special I/O mode. @@ -1194,7 +1215,8 @@ * to the xmlReadDoc() and similar calls. d xmlParserOption... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_PARSE_RECOVER... Recover on errors d c X'00000001' d XML_PARSE_NOENT... Substitute entities @@ -1246,45 +1268,47 @@ d ctxt value like(xmlParserCtxtPtr) d xmlCtxtResetPush... - d pr 10i 0 extproc('xmlCtxtResetPush') + d pr extproc('xmlCtxtResetPush') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d chunk * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d filename * value options(*string) const char * d encoding * value options(*string) const char * d xmlCtxtUseOptions... - d pr 10i 0 extproc('xmlCtxtUseOptions') + d pr extproc('xmlCtxtUseOptions') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) - d options 10i 0 value + d options value like(xmlCint) d xmlReadDoc pr extproc('xmlReadDoc') d like(xmlDocPtr) d cur * value options(*string) const xmlChar * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReadFile pr extproc('xmlReadFile') d like(xmlDocPtr) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReadMemory pr extproc('xmlReadMemory') d like(xmlDocPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReadFd pr extproc('xmlReadFd') d like(xmlDocPtr) - d fd 10i 0 value + d fd value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReadIO pr extproc('xmlReadIO') d like(xmlDocPtr) @@ -1293,7 +1317,7 @@ d ioctx * value void * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlCtxtReadDoc pr extproc('xmlCtxtReadDoc') d like(xmlDocPtr) @@ -1301,7 +1325,7 @@ d cur * value options(*string) const xmlChar * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlCtxtReadFile... d pr extproc('xmlCtxtReadFile') @@ -1309,25 +1333,25 @@ d ctxt value like(xmlParserCtxtPtr) d filename * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlCtxtReadMemory... d pr extproc('xmlCtxtReadMemory') d like(xmlDocPtr) d ctxt value like(xmlParserCtxtPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlCtxtReadFd pr extproc('xmlCtxtReadFd') d like(xmlDocPtr) d ctxt value like(xmlParserCtxtPtr) - d fd 10i 0 value + d fd value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlCtxtReadIO pr extproc('xmlCtxtReadIO') d like(xmlDocPtr) @@ -1337,7 +1361,7 @@ d ioctx * value void * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) * Library wide options @@ -1347,7 +1371,8 @@ * or disabled at compile-time. * They used to be called XML_FEATURE_xxx but this clashed with Expat - d xmlFeature s 10i 0 based(######typedef######) enum + d xmlFeature s based(######typedef######) + d like(xmlCenum) d XML_WITH_THREAD... d c 1 d XML_WITH_TREE c 2 @@ -1404,7 +1429,8 @@ d XML_WITH_LZMA c 33 d XML_WITH_NONE c 99999 - d xmlHasFeature pr 10i 0 extproc('xmlHasFeature') + d xmlHasFeature pr extproc('xmlHasFeature') + d like(xmlCint) d feature value like(xmlFeature) /endif XML_PARSER_H__ diff --git a/os400/libxmlrpg/parserInternals.rpgle b/os400/libxmlrpg/parserInternals.rpgle index 26913977..6c8f3884 100644 --- a/os400/libxmlrpg/parserInternals.rpgle +++ b/os400/libxmlrpg/parserInternals.rpgle @@ -11,6 +11,7 @@ /define XML_PARSER_INTERNALS_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/parser" /include "libxmlrpg/HTMLparser" /include "libxmlrpg/chvalid" @@ -22,7 +23,8 @@ * boundary feature, use XML_PARSE_HUGE option to override it. d xmlParserMaxDepth... - d s 10u 0 import('xmlParserMaxDepth') + d s import('xmlParserMaxDepth') + d like(xmlCuint) * XML_MAX_TEXT_LENGTH: * @@ -93,8 +95,9 @@ * Function to finish the work of the macros where needed. - d xmlIsLetter pr 10i 0 extproc('xmlIsLetter') - d c 10i 0 value + d xmlIsLetter pr extproc('xmlIsLetter') + d like(xmlCint) + d c value like(xmlCint) * Parser context. @@ -107,13 +110,13 @@ d pr extproc('xmlCreateURLParserCtxt') d like(xmlParserCtxtPtr) d filename * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlCreateMemoryParserCtxt... d pr extproc('xmlCreateMemoryParserCtxt') d like(xmlParserCtxtPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d xmlCreateEntityParserCtxt... d pr extproc('xmlCreateEntityParserCtxt') @@ -123,17 +126,20 @@ d base * value options(*string) const xmlChar * d xmlSwitchEncoding... - d pr 10i 0 extproc('xmlSwitchEncoding') + d pr extproc('xmlSwitchEncoding') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d enc value like(xmlCharEncoding) d xmlSwitchToEncoding... - d pr 10i 0 extproc('xmlSwitchToEncoding') + d pr extproc('xmlSwitchToEncoding') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d handler value like(xmlCharEncodingHandlerPtr) d xmlSwitchInputEncoding... - d pr 10i 0 extproc('xmlSwitchInputEncoding') + d pr extproc('xmlSwitchInputEncoding') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d input value like(xmlParserInputPtr) d handler value like(xmlCharEncodingHandlerPtr) @@ -152,7 +158,8 @@ d ctxt value like(xmlParserCtxtPtr) d entity value like(xmlEntityPtr) - d xmlPushInput pr 10i 0 extproc('xmlPushInput') + d xmlPushInput pr extproc('xmlPushInput') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d input value like(xmlParserInputPtr) @@ -211,13 +218,13 @@ d xmlParseCharData... d pr extproc('xmlParseCharData') d ctxt value like(xmlParserCtxtPtr) - d cdata 10i 0 value + d cdata value like(xmlCint) d xmlParseExternalID... d pr * extproc('xmlParseExternalID') xmlChar * d ctxt value like(xmlParserCtxtPtr) d publicID * xmlChar *(*) - d strict 10i 0 value + d strict value like(xmlCint) d xmlParseComment... d pr extproc('xmlParseComment') @@ -239,7 +246,8 @@ d ctxt value like(xmlParserCtxtPtr) d xmlParseDefaultDecl... - d pr 10i 0 extproc('xmlParseDefaultDecl') + d pr extproc('xmlParseDefaultDecl') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d value * xmlChar *(*) @@ -254,12 +262,14 @@ d ctxt value like(xmlParserCtxtPtr) d xmlParseEnumeratedType... - d pr 10i 0 extproc('xmlParseEnumeratedType') + d pr extproc('xmlParseEnumeratedType') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d tree * value xmlEnumerationPtr * d xmlParseAttributeType... - d pr 10i 0 extproc('xmlParseAttributeType') + d pr extproc('xmlParseAttributeType') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d tree * value xmlEnumerationPtr * @@ -272,24 +282,26 @@ d 'xmlParseElementMixedContentDecl') d like(xmlElementContentPtr) d ctxt value like(xmlParserCtxtPtr) - d inputchk 10i 0 value + d inputchk value like(xmlCint) d xmlParseElementChildrenContentDecl... d pr extproc( d 'xmlParseElementChildrenContentDecl') d like(xmlElementContentPtr) d ctxt value like(xmlParserCtxtPtr) - d inputchk 10i 0 value + d inputchk value like(xmlCint) d xmlParseElementContentDecl... - d pr 10i 0 extproc('xmlParseElementContentDecl') + d pr extproc('xmlParseElementContentDecl') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d name * value options(*string) const xmlChar * d result * value xmlElementContentPtr d * d xmlParseElementDecl... - d pr 10i 0 extproc('xmlParseElementDecl') + d pr extproc('xmlParseElementDecl') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d xmlParseMarkupDecl... @@ -297,7 +309,8 @@ d ctxt value like(xmlParserCtxtPtr) d xmlParseCharRef... - d pr 10i 0 extproc('xmlParseCharRef') + d pr extproc('xmlParseCharRef') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d xmlParseEntityRef... @@ -358,7 +371,8 @@ d pr * extproc('xmlParseEncodingDecl') const xmlChar * d ctxt value like(xmlParserCtxtPtr) - d xmlParseSDDecl pr 10i 0 extproc('xmlParseSDDecl') + d xmlParseSDDecl pr extproc('xmlParseSDDecl') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d xmlParseXMLDecl... @@ -410,7 +424,7 @@ d pr * extproc('xmlStringDecodeEntities') xmlChar * d ctxt value like(xmlParserCtxtPtr) d str * value options(*string) const xmlChar * - d what 10i 0 value + d what value like(xmlCint) d end value like(xmlChar) d end2 value like(xmlChar) d end3 value like(xmlChar) @@ -419,15 +433,16 @@ d pr * extproc('xmlStringLenDecodeEntities')xmlChar * d ctxt value like(xmlParserCtxtPtr) d str * value options(*string) const xmlChar * - d len 10i 0 value - d what 10i 0 value + d len value like(xmlCint) + d what value like(xmlCint) d end value like(xmlChar) d end2 value like(xmlChar) d end3 value like(xmlChar) * Generated by MACROS on top of parser.c c.f. PUSH_AND_POP. - d nodePush pr 10i 0 extproc('nodePush') + d nodePush pr extproc('nodePush') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d value value like(xmlNodePtr) @@ -435,7 +450,8 @@ d like(xmlNodePtr) d ctxt value like(xmlParserCtxtPtr) - d inputPush pr 10i 0 extproc('inputPush') + d inputPush pr extproc('inputPush') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d value value like(xmlParserInputPtr) @@ -446,18 +462,21 @@ d namePop pr * extproc('namePop') const xmlChar * d ctxt value like(xmlParserCtxtPtr) - d namePush pr 10i 0 extproc('namePush') + d namePush pr extproc('namePush') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d value * value options(*string) const xmlChar * * other commodities shared between parser.c and parserInternals. d xmlSkipBlankChars... - d pr 10i 0 extproc('xmlSkipBlankChars') + d pr extproc('xmlSkipBlankChars') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d xmlStringCurrentChar... - d pr 10i 0 extproc('xmlStringCurrentChar') + d pr extproc('xmlStringCurrentChar') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d cur * value options(*string) const xmlChar * d len * value int * @@ -467,24 +486,28 @@ d ctxt value like(xmlParserCtxtPtr) d xmlCheckLanguageID... - d pr 10i 0 extproc('xmlCheckLanguageID') + d pr extproc('xmlCheckLanguageID') + d like(xmlCint) d lang * value options(*string) const xmlChar * * Really core function shared with HTML parser. - d xmlCurrentChar pr 10i 0 extproc('xmlCurrentChar') + d xmlCurrentChar pr extproc('xmlCurrentChar') + d like(xmlCint) d ctxt value like(xmlParserCtxtPtr) d len * value int * d xmlCopyCharMultiByte... - d pr 10i 0 extproc('xmlCopyCharMultiByte') + d pr extproc('xmlCopyCharMultiByte') + d like(xmlCint) d out * value options(*string) xmlChar * - d val 10i 0 value + d val value like(xmlCint) - d xmlCopyChar pr 10i 0 extproc('xmlCopyChar') - d len 10i 0 value + d xmlCopyChar pr extproc('xmlCopyChar') + d like(xmlCint) + d len value like(xmlCint) d out * value options(*string) xmlChar * - d val 10i 0 value + d val value like(xmlCint) d xmlNextChar pr extproc('xmlNextChar') d ctxt value like(xmlParserCtxtPtr) @@ -560,8 +583,8 @@ d xmlDecodeEntities... d pr * extproc('xmlDecodeEntities') xmlChar * d ctxt value like(xmlParserCtxtPtr) - d len 10i 0 value - d what 10i 0 value + d len value like(xmlCint) + d what value like(xmlCint) d end value like(xmlChar) d end2 value like(xmlChar) d end3 value like(xmlChar) diff --git a/os400/libxmlrpg/pattern.rpgle b/os400/libxmlrpg/pattern.rpgle index 2e881e5d..ef023010 100644 --- a/os400/libxmlrpg/pattern.rpgle +++ b/os400/libxmlrpg/pattern.rpgle @@ -10,11 +10,13 @@ /define XML_PATTERN_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/tree" - /include "libxmlrpg/dict" /if defined(LIBXML_PATTERN_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/tree" + /include "libxmlrpg/dict" + * xmlPattern: * * A compiled (XPath based) pattern to select nodes @@ -28,7 +30,8 @@ * matching with this module d xmlPatternFlags... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_PATTERN_DEFAULT... Simple pattern match d c X'0000' d XML_PATTERN_XPATH... Std XPath pattern @@ -50,11 +53,12 @@ d like(xmlPatternPtr) d pattern * value options(*string) const xmlChar * d dict * value xmlDict * - d flags 10i 0 value + d flags value like(xmlCint) d namespaces * const xmlChar *(*) d xmlPatternMatch... - d pr 10i 0 extproc('xmlPatternMatch') + d pr extproc('xmlPatternMatch') + d like(xmlCint) d comp value like(xmlPatternPtr) d node value like(xmlNodePtr) @@ -64,19 +68,23 @@ d s * based(######typedef######) d xmlPatternStreamable... - d pr 10i 0 extproc('xmlPatternStreamable') + d pr extproc('xmlPatternStreamable') + d like(xmlCint) d comp value like(xmlPatternPtr) d xmlPatternMaxDepth... - d pr 10i 0 extproc('xmlPatternMaxDepth') + d pr extproc('xmlPatternMaxDepth') + d like(xmlCint) d comp value like(xmlPatternPtr) d xmlPatternMinDepth... - d pr 10i 0 extproc('xmlPatternMinDepth') + d pr extproc('xmlPatternMinDepth') + d like(xmlCint) d comp value like(xmlPatternPtr) d xmlPatternFromRoot... - d pr 10i 0 extproc('xmlPatternFromRoot') + d pr extproc('xmlPatternFromRoot') + d like(xmlCint) d comp value like(xmlPatternPtr) d xmlPatternGetStreamCtxt... @@ -89,28 +97,33 @@ d stream value like(xmlStreamCtxtPtr) d xmlStreamPushNode... - d pr 10i 0 extproc('xmlStreamPushNode') + d pr extproc('xmlStreamPushNode') + d like(xmlCint) d stream value like(xmlStreamCtxtPtr) d name * value options(*string) const xmlChar * d ns * value options(*string) const xmlChar * - d nodeType 10i 0 value + d nodeType value like(xmlCint) - d xmlStreamPush pr 10i 0 extproc('xmlStreamPush') + d xmlStreamPush pr extproc('xmlStreamPush') + d like(xmlCint) d stream value like(xmlStreamCtxtPtr) d name * value options(*string) const xmlChar * d ns * value options(*string) const xmlChar * d xmlStreamPushAttr... - d pr 10i 0 extproc('xmlStreamPushAttr') + d pr extproc('xmlStreamPushAttr') + d like(xmlCint) d stream value like(xmlStreamCtxtPtr) d name * value options(*string) const xmlChar * d ns * value options(*string) const xmlChar * - d xmlStreamPop pr 10i 0 extproc('xmlStreamPop') + d xmlStreamPop pr extproc('xmlStreamPop') + d like(xmlCint) d stream value like(xmlStreamCtxtPtr) d xmlStreamWantsAnyNode... - d pr 10i 0 extproc('xmlStreamWantsAnyNode') + d pr extproc('xmlStreamWantsAnyNode') + d like(xmlCint) d stream value like(xmlStreamCtxtPtr) /endif LIBXML_PATTERN_ENBLD diff --git a/os400/libxmlrpg/relaxng.rpgle b/os400/libxmlrpg/relaxng.rpgle index af662aa6..15b8471c 100644 --- a/os400/libxmlrpg/relaxng.rpgle +++ b/os400/libxmlrpg/relaxng.rpgle @@ -9,11 +9,13 @@ /define XML_RELAX_NG__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/hash" - /include "libxmlrpg/xmlstring" /if defined(LIBXML_SCHEMAS_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/hash" + /include "libxmlrpg/xmlstring" + d xmlRelaxNGPtr s * based(######typedef######) * xmlRelaxNGValidityErrorFunc: @@ -51,7 +53,8 @@ * List of possible Relax NG validation errors d xmlRelaxNGValidErr... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_RELAXNG_OK... d c 0 d XML_RELAXNG_ERR_MEMORY... @@ -138,7 +141,8 @@ * List of possible Relax NG Parser flags d xmlRelaxNGParserFlag... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_RELAXNGP_NONE... d c 0 d XML_RELAXNGP_FREE_DOC... @@ -147,7 +151,8 @@ d c 2 d xmlRelaxNGInitTypes... - d pr 10i 0 extproc('xmlRelaxNGInitTypes') + d pr extproc('xmlRelaxNGInitTypes') + d like(xmlCint) d xmlRelaxNGCleanupTypes... d pr extproc('xmlRelaxNGCleanupTypes') @@ -164,7 +169,7 @@ d pr extproc('xmlRelaxNGNewMemParserCtxt') d like(xmlRelaxNGParserCtxtPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d xmlRelaxNGNewDocParserCtxt... d pr extproc('xmlRelaxNGNewDocParserCtxt') @@ -172,9 +177,10 @@ d doc value like(xmlDocPtr) d xmlRelaxParserSetFlag... - d pr 10i 0 extproc('xmlRelaxParserSetFlag') + d pr extproc('xmlRelaxParserSetFlag') + d like(xmlCint) d ctxt value like(xmlRelaxNGParserCtxtPtr) - d flag 10i 0 value + d flag value like(xmlCint) d xmlRelaxNGFreeParserCtxt... d pr extproc('xmlRelaxNGFreeParserCtxt') @@ -190,7 +196,8 @@ d ctx * value void * d xmlRelaxNGGetParserErrors... - d pr 10i 0 extproc('xmlRelaxNGGetParserErrors') + d pr extproc('xmlRelaxNGGetParserErrors') + d like(xmlCint) d ctxt value like(xmlRelaxNGParserCtxtPtr) d err like(xmlRelaxNGValidityErrorFunc) d warn like(xmlRelaxNGValidityWarningFunc) @@ -236,7 +243,8 @@ d ctx * value void * d xmlRelaxNGGetValidErrors... - d pr 10i 0 extproc('xmlRelaxNGGetValidErrors') + d pr extproc('xmlRelaxNGGetValidErrors') + d like(xmlCint) d ctxt value like(xmlRelaxNGValidCtxtPtr) d err like(xmlRelaxNGValidityErrorFunc) d warn like(xmlRelaxNGValidityWarningFunc) @@ -259,36 +267,41 @@ d ctxt value like(xmlRelaxNGValidCtxtPtr) d xmlRelaxNGValidateDoc... - d pr 10i 0 extproc('xmlRelaxNGValidateDoc') + d pr extproc('xmlRelaxNGValidateDoc') + d like(xmlCint) d ctxt value like(xmlRelaxNGValidCtxtPtr) d doc value like(xmlDocPtr) * Interfaces for progressive validation when possible d xmlRelaxNGValidatePushElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlRelaxNGValidatePushElement') + d like(xmlCint) d ctxt value like(xmlRelaxNGValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) d xmlRelaxNGValidatePushCData... - d pr 10i 0 extproc( + d pr extproc( d 'xmlRelaxNGValidatePushCData') + d like(xmlCint) d ctxt value like(xmlRelaxNGValidCtxtPtr) d data * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlRelaxNGValidatePopElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlRelaxNGValidatePopElement') + d like(xmlCint) d ctxt value like(xmlRelaxNGValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) d xmlRelaxNGValidateFullElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlRelaxNGValidateFullElement') + d like(xmlCint) d ctxt value like(xmlRelaxNGValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) diff --git a/os400/libxmlrpg/schemasInternals.rpgle b/os400/libxmlrpg/schemasInternals.rpgle index edeea5b7..8d3013ef 100644 --- a/os400/libxmlrpg/schemasInternals.rpgle +++ b/os400/libxmlrpg/schemasInternals.rpgle @@ -15,12 +15,15 @@ /include "libxmlrpg/xmlversion" /if defined(LIBXML_SCHEMAS_ENABLED) + + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/xmlregexp" /include "libxmlrpg/hash" /include "libxmlrpg/dict" d xmlSchemaValType... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_SCHEMAS_UNKNOWN... d c 0 d XML_SCHEMAS_STRING... @@ -119,7 +122,8 @@ * XML Schemas defines multiple type of types. d xmlSchemaTypeType... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_SCHEMA_TYPE_BASIC... A builtin datatype d c 1 d XML_SCHEMA_TYPE_ANY... @@ -202,7 +206,8 @@ d c 2001 d xmlSchemaContentType... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_SCHEMA_CONTENT_UNKNOWN... d c 0 d XML_SCHEMA_CONTENT_EMPTY... @@ -357,13 +362,13 @@ d annot like(xmlSchemaAnnotPtr) * d base like(xmlSchemaTypePtr) Deprecated - d occurs 10i 0 Deprecated + d occurs like(xmlCint) Deprecated d defValue * const xmlChar * d subtypes like(xmlSchemaTypePtr) The type definition d node like(xmlNodePtr) d targetNamespace... const xmlChar * d * - d flags 10i 0 + d flags like(xmlCint) d refPrefix * const xmlChar * d defVal like(xmlSchemaValPtr) Compiled constraint d refDecl like(xmlSchemaAttributePtr) Deprecated @@ -413,14 +418,14 @@ d id * const xmlChar * d annot like(xmlSchemaAnnotPtr) d node like(xmlNodePtr) - d minOccurs 10i 0 Deprecated; not used - d maxOccurs 10i 0 Deprecated; not used + d minOccurs like(xmlCint) Deprecated; not used + d maxOccurs like(xmlCint) Deprecated; not used d processContents... - d 10i 0 - d any 10i 0 Ns constraint ##any? + d like(xmlCint) + d any like(xmlCint) Ns constraint ##any? d nsSet like(xmlSchemaWildcardNsPtr) Allowed namspce list d negNsSet like(xmlSchemaWildcardNsPtr) Negated namespace - d flags 10i 0 Deprecated; not used + d flags like(xmlCint) Deprecated; not used * XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED: * @@ -478,7 +483,7 @@ * d attributes like(xmlSchemaAttributePtr) Deprecated; not used d node like(xmlNodePtr) - d flags 10i 0 + d flags like(xmlCint) d attributeWildcard... d like(xmlSchemaWildcardPtr) d refPrefix * const xmlChar * @@ -753,21 +758,21 @@ d subtypes like(xmlSchemaTypePtr) d attributes like(xmlSchemaAttributePtr) Deprecated; not used d node like(xmlNodePtr) - d minOccurs 10i 0 Deprecated; not used - d maxOccurs 10i 0 Deprecated; not used + d minOccurs like(xmlCint) Deprecated; not used + d maxOccurs like(xmlCint) Deprecated; not used * - d flags 10i 0 + d flags like(xmlCint) d contentType like(xmlSchemaContentType) d base * const xmlChar * d baseNs * const xmlChar * d baseType like(xmlSchemaTypePtr) Base type component d facets like(xmlSchemaFacetPtr) Local facets d redef like(xmlSchemaTypePtr) Deprecated; not used - d recurse 10i 0 Obsolete + d recurse like(xmlCint) Obsolete d attributeUses like(xmlSchemaAttributeLinkPtr) Deprecated; not used d attributeWildcard... d like(xmlSchemaWildcardPtr) - d builtInType 10i 0 Built-in types type + d builtInType like(xmlCint) Built-in types type d memberTypes like(xmlSchemaTypeLinkPtr) Union member-types d facetSet like(xmlSchemaFacetLinkPtr) All facets d refPrefix * const xmlChar * @@ -937,10 +942,10 @@ d subtypes like(xmlSchemaTypePtr) d attributes like(xmlSchemaAttributePtr) Deprecated; not used d node like(xmlNodePtr) - d minOccurs 10i 0 Deprecated; not used - d maxOccurs 10i 0 Deprecated; not used + d minOccurs like(xmlCint) Deprecated; not used + d maxOccurs like(xmlCint) Deprecated; not used * - d flags 10i 0 + d flags like(xmlCint) d targetNamespace... d * const xmlChar * d namedType * const xmlChar * @@ -995,8 +1000,8 @@ d id * const xmlChar * d annot like(xmlSchemaAnnotPtr) d node like(xmlNodePtr) - d fixed 10i 0 _FACET_PRESERVE, etc - d whitespace 10i 0 + d fixed like(xmlCint) _FACET_PRESERVE, etc + d whitespace like(xmlCint) d val like(xmlSchemaValPtr) Compiled value d regexp like(xmlRegexpPtr) Regexp for patterns @@ -1106,7 +1111,7 @@ d id * const xmlChar * d doc like(xmlDocPtr) d annot like(xmlSchemaAnnotPtr) - d flags 10i 0 + d flags like(xmlCint) * d typeDecl like(xmlHashTablePtr) d attrDecl like(xmlHashTablePtr) @@ -1120,8 +1125,8 @@ d groupDecl like(xmlHashTablePtr) d dict like(xmlDictPtr) d includes * void * - d preserve 10i 0 Do not free doc ? - d counter 10i 0 For name uniqueness + d preserve like(xmlCint) Do not free doc ? + d counter like(xmlCint) For name uniqueness d idcDef like(xmlHashTablePtr) All id-constr. defs d volatiles * void * diff --git a/os400/libxmlrpg/schematron.rpgle b/os400/libxmlrpg/schematron.rpgle index c987cd5e..8271ca5e 100644 --- a/os400/libxmlrpg/schematron.rpgle +++ b/os400/libxmlrpg/schematron.rpgle @@ -12,10 +12,12 @@ /if defined(LIBXML_SCHEMATRON_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/tree" d xmlSchematronValidOptions... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_SCHEMATRON_OUT_QUIET... Quiet no report d c X'0001' d XML_SCHEMATRON_OUT_TEXT... Build textual report @@ -78,7 +80,7 @@ d 'xmlSchematronNewMemParserCtxt') d like(xmlSchematronParserCtxtPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d xmlSchematronNewDocParserCtxt... d pr extproc( @@ -105,8 +107,9 @@ d ctx * value void * d xmlSchematronGetParserErrors... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchematronGetParserErrors') + d like(xmlCint) d ctxt value d like(xmlSchematronParserCtxtPtr) d err like(xmlSchematronValidityErrorFunc) @@ -115,7 +118,8 @@ d ctx * void *(*) d xmlSchematronIsValid... - d pr 10i 0 extproc('xmlSchematronIsValid') + d pr extproc('xmlSchematronIsValid') + d like(xmlCint) d ctxt value like(xmlSchematronValidCtxtPtr) /endif @@ -150,8 +154,9 @@ d ctx * value void * d xmlSchematronGetValidErrors... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchematronGetValidErrors') + d like(xmlCint) d ctxt value like(xmlSchematronValidCtxtPtr) d err like(xmlSchematronValidityErrorFunc) d warn like( @@ -159,19 +164,22 @@ d ctx * void *(*) d xmlSchematronSetValidOptions... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchematronSetValidOptions') + d like(xmlCint) d ctxt value like(xmlSchematronValidCtxtPtr) - d options 10i 0 value + d options value like(xmlCint) d xmlSchematronValidCtxtGetOptions... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchematronValidCtxtGetOptions') + d like(xmlCint) d ctxt value like(xmlSchematronValidCtxtPtr) d xmlSchematronValidateOneElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchematronValidateOneElement') + d like(xmlCint) d ctxt value like(xmlSchematronValidCtxtPtr) d elem value like(xmlNodePtr) /endif @@ -180,14 +188,15 @@ d pr extproc('xmlSchematronNewValidCtxt') d like(xmlSchematronValidCtxtPtr) d schema value like(xmlSchematronPtr) - d options 10i 0 value + d options value like(xmlCint) d xmlSchematronFreeValidCtxt... d pr extproc('xmlSchematronFreeValidCtxt') d ctxt value like(xmlSchematronValidCtxtPtr) d xmlSchematronValidateDoc... - d pr 10i 0 extproc('xmlSchematronValidateDoc') + d pr extproc('xmlSchematronValidateDoc') + d like(xmlCint) d ctxt value like(xmlSchematronValidCtxtPtr) d instance value like(xmlDocPtr) diff --git a/os400/libxmlrpg/threads.rpgle b/os400/libxmlrpg/threads.rpgle index 07d42785..124798bb 100644 --- a/os400/libxmlrpg/threads.rpgle +++ b/os400/libxmlrpg/threads.rpgle @@ -10,6 +10,7 @@ /define XML_THREADS_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" * xmlMutex are a simple mutual exception locks. @@ -55,10 +56,12 @@ d xmlUnlockLibrary... d pr extproc('xmlUnlockLibrary') - d xmlGetThreadId pr 10i 0 extproc('xmlGetThreadId') + d xmlGetThreadId pr extproc('xmlGetThreadId') + d like(xmlCint) d xmlIsMainThread... - d pr 10i 0 extproc('xmlIsMainThread') + d pr extproc('xmlIsMainThread') + d like(xmlCint) d xmlCleanupThreads... d pr extproc('xmlCleanupThreads') diff --git a/os400/libxmlrpg/tree.rpgle b/os400/libxmlrpg/tree.rpgle index 5c67f4fa..6512778c 100644 --- a/os400/libxmlrpg/tree.rpgle +++ b/os400/libxmlrpg/tree.rpgle @@ -67,7 +67,8 @@ * need or double it's allocated size each time it is found too small. d xmlBufferAllocationScheme... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_BUFFER_ALLOC_DOUBLEIT... d c 0 d XML_BUFFER_ALLOC_EXACT... @@ -89,8 +90,8 @@ d xmlBuffer ds based(xmlBufferPtr) d align qualified d content * xmlChar * - d use 10u 0 The buffer size used - d size 10u 0 The buffer size + d use like(xmlCuint) + d size like(xmlCuint) d alloc like(xmlBufferAllocationScheme) The realloc method d contentIO * xmlChar * @@ -150,7 +151,8 @@ * Actually this had diverged a bit, and now XML_DOCUMENT_TYPE_NODE should * be deprecated to use an XML_DTD_NODE. - d xmlElementType s 10i 0 based(######typedef######) enum + d xmlElementType s based(######typedef######) + d like(xmlCenum) d XML_ELEMENT_NODE... d c 1 d XML_ATTRIBUTE_NODE... @@ -212,7 +214,8 @@ * A DTD Attribute type definition. d xmlAttributeType... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_ATTRIBUTE_CDATA... d c 1 d XML_ATTRIBUTE_ID... @@ -239,7 +242,8 @@ * A DTD Attribute default definition. d xmlAttributeDefault... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_ATTRIBUTE_NONE... d c 1 d XML_ATTRIBUTE_REQUIRED... @@ -298,7 +302,8 @@ * Possible definitions of element content types. d xmlElementContentType... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_ELEMENT_CONTENT_PCDATA... d c 1 d XML_ELEMENT_CONTENT_ELEMENT... @@ -313,7 +318,8 @@ * Possible definitions of element content occurrences. d xmlElementContentOccur... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_ELEMENT_CONTENT_ONCE... d c 1 d XML_ELEMENT_CONTENT_OPT... @@ -347,7 +353,8 @@ * The different possibilities for an element content type. d xmlElementTypeVal... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_ELEMENT_TYPE_UNDEFINED... d c 0 d XML_ELEMENT_TYPE_EMPTY... @@ -469,7 +476,7 @@ d next like(xmlIdPtr) Next ID d attr like(xmlAttrPtr) Attribute holding it d name * const xmlChar * - d lineno 10i 0 Line # if not avail + d lineno like(xmlCint) Line # if not avail d doc like(xmlDocPtr) Doc holding ID * xmlRef: @@ -484,7 +491,7 @@ d value * const xmlChar * d attr like(xmlAttrPtr) Attribute holding it d name * const xmlChar * - d lineno 10i 0 Line # if not avail + d lineno like(xmlCint) Line # if not avail * xmlNode: * @@ -515,7 +522,8 @@ * Some of them are linked to similary named xmlParserOption d xmlDocProperties... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_DOC_WELLFORMED... d c X'00000001' d XML_DOC_NSVALID... @@ -546,8 +554,8 @@ d next like(xmlNodePtr) next sibling link d prev like(xmlNodePtr) previous sibling lnk d doc like(xmlDocPtr) Reference to itself - d compression 10i 0 zlib compression lev - d standalone 10i 0 + d compression like(xmlCint) zlib compression lev + d standalone like(xmlCint) d intSubset like(xmlDtdPtr) Internal subset d extSubset like(xmlDtdPtr) External subset d oldns like(xmlNsPtr) Global namespace @@ -556,11 +564,11 @@ d ids * IDs hash table d refs * IDREFs hash table d URL * const xmlChar * - d charset 10i 0 In-memory encoding + d charset like(xmlCint) In-memory encoding d dict * xmlDictPtr for names d psvi * Type/PSVI ino - d parseFlags 10i 0 xmlParserOption's - d properties 10i 0 xmlDocProperties + d parseFlags like(xmlCint) xmlParserOption's + d properties like(xmlCint) xmlDocProperties * xmlDOMWrapAcquireNsFunction: * @ctxt: a DOM wrapper context @@ -587,7 +595,7 @@ d ds based(xmlDOMWrapCtxtPtr) d align qualified d #private * void * - d type 10i 0 + d type like(xmlCint) d namespaceMap * void * d getNsForNodeFunc... d like(xmlDOMWrapAcquireNsFunction) @@ -619,9 +627,10 @@ /endif /if defined(XML_TESTVAL) d xmlValidateNCName... - d pr 10i 0 extproc('xmlValidateNCName') + d pr extproc('xmlValidateNCName') + d like(xmlCint) d value * value options(*string) const xmlChar * - d space 10i 0 value + d space value like(xmlCint) /undefine XML_TESTVAL /endif @@ -633,19 +642,22 @@ /endif /if defined(XML_TESTVAL) d xmlValidateQName... - d pr 10i 0 extproc('xmlValidateQName') + d pr extproc('xmlValidateQName') + d like(xmlCint) d value * value options(*string) const xmlChar * - d space 10i 0 value + d space value like(xmlCint) d xmlValidateName... - d pr 10i 0 extproc('xmlValidateName') + d pr extproc('xmlValidateName') + d like(xmlCint) d value * value options(*string) const xmlChar * - d space 10i 0 value + d space value like(xmlCint) d xmlValidateNMToken... - d pr 10i 0 extproc('xmlValidateNMToken') + d pr extproc('xmlValidateNMToken') + d like(xmlCint) d value * value options(*string) const xmlChar * - d space 10i 0 value + d space value like(xmlCint) /undefine XML_TESTVAL /endif @@ -654,7 +666,7 @@ d ncname * value options(*string) const xmlChar * d prefix * value options(*string) const xmlChar * d memory 65535 options(*varsize: *omit) xmlChar[] - d len 10i 0 value memory length + d len value like(xmlCint) memory length d xmlSplitQName2 pr * extproc('xmlSplitQName2') xmlChar * d name * value options(*string) const xmlChar * @@ -662,7 +674,7 @@ d xmlSplitQName3 pr * extproc('xmlSplitQName3') const xmlChar * d name * value options(*string) const xmlChar * - d len 10i 0 + d len like(xmlCint) * Handling Buffers, the old ones see @xmlBuf for the new ones. @@ -693,44 +705,52 @@ d size value like(xmlCsize_t) d xmlBufferResize... - d pr 10i 0 extproc('xmlBufferResize') + d pr extproc('xmlBufferResize') + d like(xmlCint) d buf value like(xmlBufferPtr) d size value like(xmlCsize_t) d xmlBufferFree pr extproc('xmlBufferFree') d buf value like(xmlBufferPtr) - d xmlBufferDump pr 10i 0 extproc('xmlBufferDump') + d xmlBufferDump pr extproc('xmlBufferDump') + d like(xmlCint) d file * value FILE * d buf value like(xmlBufferPtr) - d xmlBufferAdd pr 10i 0 extproc('xmlBufferAdd') + d xmlBufferAdd pr extproc('xmlBufferAdd') + d like(xmlCint) d buf value like(xmlBufferPtr) d str * value options(*string) const xmlChar * - d len 10i 0 value str length + d len value like(xmlCint) str length d xmlBufferAddHead... - d pr 10i 0 extproc('xmlBufferAddHead') + d pr extproc('xmlBufferAddHead') + d like(xmlCint) d buf value like(xmlBufferPtr) d str * value options(*string) const xmlChar * - d len 10i 0 value str length + d len value like(xmlCint) str length - d xmlBufferCat pr 10i 0 extproc('xmlBufferCat') + d xmlBufferCat pr extproc('xmlBufferCat') + d like(xmlCint) d buf value like(xmlBufferPtr) d str * value options(*string) const xmlChar * - d xmlBufferCCat pr 10i 0 extproc('xmlBufferCCat') + d xmlBufferCCat pr extproc('xmlBufferCCat') + d like(xmlCint) d buf value like(xmlBufferPtr) d str * value options(*string) const char * d xmlBufferShrink... - d pr 10i 0 extproc('xmlBufferShrink') + d pr extproc('xmlBufferShrink') + d like(xmlCint) d buf value like(xmlBufferPtr) - d len 10u 0 value str length + d len value like(xmlCuint) - d xmlBufferGrow pr 10i 0 extproc('xmlBufferGrow') + d xmlBufferGrow pr extproc('xmlBufferGrow') + d like(xmlCint) d buf value like(xmlBufferPtr) - d len 10u 0 value str length + d len value like(xmlCuint) d xmlBufferEmpty pr extproc('xmlBufferEmpty') d buf value like(xmlBufferPtr) @@ -751,7 +771,8 @@ d like(xmlBufferAllocationScheme) d xmlBufferLength... - d pr 10i 0 extproc('xmlBufferLength') + d pr extproc('xmlBufferLength') + d like(xmlCint) d buf value like(xmlBufferPtr) * Creating/freeing new structures. @@ -876,7 +897,7 @@ d xmlCopyDoc pr extproc('xmlCopyDoc') d like(xmlDocPtr) d doc value like(xmlDocPtr) - d recursive 10i 0 value + d recursive value like(xmlCint) /undefine XML_TESTVAL /endif @@ -950,12 +971,12 @@ d like(xmlNodePtr) d doc value like(xmlDocPtr) d content * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlNewTextLen pr extproc('xmlNewTextLen') d like(xmlNodePtr) d content * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlNewDocComment... d pr extproc('xmlNewDocComment') @@ -972,7 +993,7 @@ d like(xmlNodePtr) d doc value like(xmlDocPtr) d content * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlNewCharRef pr extproc('xmlNewCharRef') d like(xmlNodePtr) @@ -988,13 +1009,13 @@ d xmlCopyNode pr extproc('xmlCopyNode') d like(xmlNodePtr) d node value like(xmlNodePtr) - d recursive 10i 0 value + d recursive value like(xmlCint) d xmlDocCopyNode pr extproc('xmlDocCopyNode') d like(xmlNodePtr) d node value like(xmlNodePtr) d doc value like(xmlDocPtr) - d recursive 10i 0 value + d recursive value like(xmlCint) d xmlDocCopyNodeList... d pr extproc('xmlDocCopyNodeList') @@ -1059,10 +1080,12 @@ d like(xmlNodePtr) d parent value like(xmlNodePtr) - d xmlNodeIsText pr 10i 0 extproc('xmlNodeIsText') + d xmlNodeIsText pr extproc('xmlNodeIsText') + d like(xmlCint) d node value like(xmlNodePtr) - d xmlIsBlankNode pr 10i 0 extproc('xmlIsBlankNode') + d xmlIsBlankNode pr extproc('xmlIsBlankNode') + d like(xmlCint) d node value like(xmlNodePtr) * Changing the structure. @@ -1149,10 +1172,11 @@ d first value like(xmlNodePtr) d second value like(xmlNodePtr) - d xmlTextConcat pr 10i 0 extproc('xmlTextConcat') + d xmlTextConcat pr extproc('xmlTextConcat') + d like(xmlCint) d node value like(xmlNodePtr) d content * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlFreeNodeList... d pr extproc('xmlFreeNodeList') @@ -1276,20 +1300,20 @@ d like(xmlNodePtr) d doc value like(xmlDocPtr) d value * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlNodeListGetString... d pr * extproc('xmlNodeListGetString') xmlChar * d doc value like(xmlDocPtr) d list value like(xmlNodePtr) - d inLine 10i 0 value + d inLine value like(xmlCint) /if defined(LIBXML_TREE_ENABLED) d xmlNodeListGetRawString... d pr * extproc('xmlNodeListGetRawString') xmlChar * d doc value like(xmlDocPtr) d list value like(xmlNodePtr) - d inLine 10i 0 value + d inLine value like(xmlCint) /endif LIBXML_TREE_ENABLED d xmlNodeSetContent... @@ -1302,7 +1326,7 @@ d pr extproc('xmlNodeSetContentLen') d cur value like(xmlNodePtr) d content * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) /endif LIBXML_TREE_ENABLED d xmlNodeAddContent... @@ -1314,19 +1338,21 @@ d pr extproc('xmlNodeAddContentLen') d cur value like(xmlNodePtr) d content * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlNodeGetContent... d pr * extproc('xmlNodeGetContent') xmlChar * d cur value like(xmlNodePtr) d xmlNodeBufGetContent... - d pr 10i 0 extproc('xmlNodeBufGetContent') + d pr extproc('xmlNodeBufGetContent') + d like(xmlCint) d buffer value like(xmlBufferPtr) d cur value like(xmlNodePtr) d xmlBufGetNodeContent... - d pr 10i 0 extproc('xmlBufGetNodeContent') + d pr extproc('xmlBufGetNodeContent') + d like(xmlCint) d buf value like(xmlBufPtr) d cur value like(xmlNodePtr) @@ -1334,7 +1360,8 @@ d cur value like(xmlNodePtr) d xmlNodeGetSpacePreserve... - d pr 10i 0 extproc('xmlNodeGetSpacePreserve') + d pr extproc('xmlNodeGetSpacePreserve') + d like(xmlCint) d cur value like(xmlNodePtr) /if defined(LIBXML_TREE_ENABLED) @@ -1345,7 +1372,7 @@ d xmlNodeSetSpacePreserve... d pr extproc('xmlNodeSetSpacePreserve') d cur value like(xmlNodePtr) - d val 10i 0 value + d val value like(xmlCint) /endif LIBXML_TREE_ENABLED d xmlNodeGetBase pr * extproc('xmlNodeGetBase') xmlChar * @@ -1367,7 +1394,8 @@ * Removing content. - d xmlRemoveProp pr 10i 0 extproc('xmlRemoveProp') + d xmlRemoveProp pr extproc('xmlRemoveProp') + d like(xmlCint) d cur value like(xmlAttrPtr) /if defined(LIBXML_TREE_ENABLED) @@ -1376,12 +1404,14 @@ /define XML_TESTVAL /endif /if defined(XML_TESTVAL) - d xmlUnsetNsProp pr 10i 0 extproc('xmlUnsetNsProp') + d xmlUnsetNsProp pr extproc('xmlUnsetNsProp') + d like(xmlCint) d node value like(xmlNodePtr) d ns value like(xmlNsPtr) d name * value options(*string) const xmlChar * - d xmlUnsetProp pr 10i 0 extproc('xmlUnsetProp') + d xmlUnsetProp pr extproc('xmlUnsetProp') + d like(xmlCint) d node value like(xmlNodePtr) d name * value options(*string) const xmlChar * @@ -1418,7 +1448,8 @@ * Namespace handling. d xmlReconciliateNs... - d pr 10i 0 extproc('xmlReconciliateNs') + d pr extproc('xmlReconciliateNs') + d like(xmlCint) d doc value like(xmlDocPtr) d tree value like(xmlNodePtr) /endif @@ -1431,37 +1462,39 @@ d pr extproc('xmlDocDumpFormatMemory') d cur value like(xmlDocPtr) d mem * xmlChar * (*) - d size 10i 0 - d format 10i 0 value + d size like(xmlCint) + d format value like(xmlCint) d xmlDocDumpMemory... d pr extproc('xmlDocDumpMemory') d cur value like(xmlDocPtr) d mem * xmlChar * (*) - d size 10i 0 + d size like(xmlCint) d xmlDocDumpMemoryEnc... d pr extproc('xmlDocDumpMemoryEnc') d out_doc value like(xmlDocPtr) d doc_txt_ptr * xmlChar * (*) - d doc_txt_len 10i 0 + d doc_txt_len like(xmlCint) d txt_encoding * value options(*string) const char * d xmlDocDumpFormatMemoryEnc... d pr extproc('xmlDocDumpFormatMemoryEnc') d out_doc value like(xmlDocPtr) d doc_txt_ptr * xmlChar * (*) - d doc_txt_len 10i 0 + d doc_txt_len like(xmlCint) d txt_encoding * value options(*string) const char * - d format 10i 0 value + d format value like(xmlCint) d xmlDocFormatDump... - d pr 10i 0 extproc('xmlDocFormatDump') + d pr extproc('xmlDocFormatDump') + d like(xmlCint) d f * value FILE * d cur value like(xmlDocPtr) - d format 10i 0 value + d format value like(xmlCint) - d xmlDocDump pr 10i 0 extproc('xmlDocDump') + d xmlDocDump pr extproc('xmlDocDump') + d like(xmlCint) d f * value FILE * d cur value like(xmlDocPtr) @@ -1470,60 +1503,67 @@ d doc value like(xmlDocPtr) d cur value like(xmlNodePtr) - d xmlSaveFile pr 10i 0 extproc('xmlSaveFile') + d xmlSaveFile pr extproc('xmlSaveFile') + d like(xmlCint) d filename * value options(*string) const char * d cur value like(xmlDocPtr) d xmlSaveFormatFile... - d pr 10i 0 extproc('xmlSaveFormatFile') + d pr extproc('xmlSaveFormatFile') + d like(xmlCint) d filename * value options(*string) const char * d cur value like(xmlDocPtr) - d format 10i 0 value + d format value like(xmlCint) d xmlBufNodeDump pr extproc('xmlBufNodeDump') d like(xmlCsize_t) d buf value like(xmlBufPtr) d doc value like(xmlDocPtr) d cur value like(xmlNodePtr) - d level 10i 0 value - d format 10i 0 value + d level value like(xmlCint) + d format value like(xmlCint) - d xmlNodeDump pr 10i 0 extproc('xmlNodeDump') + d xmlNodeDump pr extproc('xmlNodeDump') + d like(xmlCint) d buf value like(xmlBufferPtr) d doc value like(xmlDocPtr) d cur value like(xmlNodePtr) - d level 10i 0 value - d format 10i 0 value + d level value like(xmlCint) + d format value like(xmlCint) - d xmlSaveFileTo pr 10i 0 extproc('xmlSaveFileTo') + d xmlSaveFileTo pr extproc('xmlSaveFileTo') + d like(xmlCint) d buf value like(xmlOutputBufferPtr) d cur value like(xmlDocPtr) d encoding * value options(*string) const char * d xmlSaveFormatFileTo... - d pr 10i 0 extproc('xmlSaveFormatFileTo') + d pr extproc('xmlSaveFormatFileTo') + d like(xmlCint) d buf value like(xmlOutputBufferPtr) d cur value like(xmlDocPtr) d encoding * value options(*string) const char * - d format 10i 0 value + d format value like(xmlCint) d xmlNodeDumpOutput... d pr extproc('xmlNodeDumpOutput') d buf value like(xmlOutputBufferPtr) d doc value like(xmlDocPtr) d cur value like(xmlNodePtr) - d level 10i 0 value - d format 10i 0 value + d level value like(xmlCint) + d format value like(xmlCint) d encoding * value options(*string) const char * d xmlSaveFormatFileEnc... - d pr 10i 0 extproc('xmlSaveFormatFileEnc') + d pr extproc('xmlSaveFormatFileEnc') + d like(xmlCint) d filename * value options(*string) const char * d cur value like(xmlDocPtr) d encoding * value options(*string) const char * - d format 10i 0 value + d format value like(xmlCint) - d xmlSaveFileEnc pr 10i 0 extproc('xmlSaveFileEnc') + d xmlSaveFileEnc pr extproc('xmlSaveFileEnc') + d like(xmlCint) d filename * value options(*string) const char * d cur value like(xmlDocPtr) d encoding * value options(*string) const char * @@ -1531,27 +1571,30 @@ * XHTML - d xmlIsXHTML pr 10i 0 extproc('xmlIsXHTML') + d xmlIsXHTML pr extproc('xmlIsXHTML') + d like(xmlCint) d systemID * value options(*string) const xmlChar * d publicID * value options(*string) const xmlChar * * Compression. d xmlGetDocCompressMode... - d pr 10i 0 extproc('xmlGetDocCompressMode') + d pr extproc('xmlGetDocCompressMode') + d like(xmlCint) d doc value like(xmlDocPtr) d xmlSetDocCompressMode... d pr extproc('xmlSetDocCompressMode') d doc value like(xmlDocPtr) - d mode 10i 0 value + d mode value like(xmlCint) d xmlGetCompressMode... - d pr 10i 0 extproc('xmlGetCompressMode') + d pr extproc('xmlGetCompressMode') + d like(xmlCint) d xmlSetCompressMode... d pr extproc('xmlSetCompressMode') - d mode 10i 0 value + d mode value like(xmlCint) * DOM-wrapper helper functions. @@ -1564,37 +1607,41 @@ d ctxt value like(xmlDOMWrapCtxtPtr) d xmlDOMWrapReconcileNamespaces... - d pr 10i 0 extproc( + d pr extproc( d 'xmlDOMWrapReconcileNamespaces') + d like(xmlCint) d ctxt value like(xmlDOMWrapCtxtPtr) d elem value like(xmlNodePtr) - d options 10i 0 value + d options value like(xmlCint) d xmlDOMWrapAdoptNode... - d pr 10i 0 extproc('xmlDOMWrapAdoptNode') + d pr extproc('xmlDOMWrapAdoptNode') + d like(xmlCint) d ctxt value like(xmlDOMWrapCtxtPtr) d sourceDoc value like(xmlDocPtr) d node value like(xmlNodePtr) d destDoc value like(xmlDocPtr) d destParent value like(xmlNodePtr) - d options 10i 0 value + d options value like(xmlCint) d xmlDOMWrapRemoveNode... - d pr 10i 0 extproc('xmlDOMWrapRemoveNode') + d pr extproc('xmlDOMWrapRemoveNode') + d like(xmlCint) d ctxt value like(xmlDOMWrapCtxtPtr) d doc value like(xmlDocPtr) d node value like(xmlNodePtr) - d options 10i 0 value + d options value like(xmlCint) d xmlDOMWrapCloneNode... - d pr 10i 0 extproc('xmlDOMWrapCloneNode') + d pr extproc('xmlDOMWrapCloneNode') + d like(xmlCint) d ctxt value like(xmlDOMWrapCtxtPtr) d sourceDoc value like(xmlDocPtr) d node value like(xmlNodePtr) d clonedNode like(xmlNodePtr) d destDoc value like(xmlDocPtr) d destParent value like(xmlNodePtr) - d options 10i 0 value + d options value like(xmlCint) /if defined(LIBXML_TREE_ENABLED) diff --git a/os400/libxmlrpg/uri.rpgle b/os400/libxmlrpg/uri.rpgle index 9a23d80d..de03392f 100644 --- a/os400/libxmlrpg/uri.rpgle +++ b/os400/libxmlrpg/uri.rpgle @@ -10,6 +10,7 @@ /define XML_URI_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/tree" * xmlURI: @@ -30,11 +31,11 @@ d authority * char * d server * char * d user * char * - d port 10i 0 + d port like(xmlCint) d path * char * d query * char * d fragment * char * - d cleanup 10i 0 + d cleanup like(xmlCint) d query_raw * char * d xmlCreateURI pr extproc('xmlCreateURI') @@ -56,10 +57,11 @@ d xmlParseURIRaw pr extproc('xmlParseURIRaw') d like(xmlURIPtr) d str * value options(*string) const char * - d raw 10i 0 value + d raw value like(xmlCint) d xmlParseURIReference... - d pr 10i 0 extproc('xmlParseURIReference') + d pr extproc('xmlParseURIReference') + d like(xmlCint) d uri value like(xmlURIPtr) d str * value options(*string) const char * @@ -78,11 +80,12 @@ d xmlURIUnescapeString... d pr * extproc('xmlURIUnescapeString') char * d str * value options(*string) const char * - d len 10i 0 value + d len value like(xmlCint) d target * value options(*string) char * d xmlNormalizeURIPath... - d pr 10i 0 extproc('xmlNormalizeURIPath') + d pr extproc('xmlNormalizeURIPath') + d like(xmlCint) d path * value options(*string) char * d xmlURIEscape pr * extproc('xmlURIEscape') xmlChar * diff --git a/os400/libxmlrpg/valid.rpgle b/os400/libxmlrpg/valid.rpgle index 722b89d2..32ebbd39 100644 --- a/os400/libxmlrpg/valid.rpgle +++ b/os400/libxmlrpg/valid.rpgle @@ -9,6 +9,7 @@ /define XML_VALID_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/xmlerror" /include "libxmlrpg/tree" /include "libxmlrpg/list" @@ -63,19 +64,19 @@ * Node analysis stack used when validating within entities * d node like(xmlNodePtr) Current parsed Node - d nodeNr 10i 0 Parsing stack depth - d nodeMax 10i 0 Max stack depth + d nodeNr like(xmlCint) Parsing stack depth + d nodeMax like(xmlCint) Max stack depth d nodeTab * xmlNodePtr * * - d finishDtd 10u 0 Finish validtng DTD? + d finishDtd like(xmlCuint) d doc like(xmlDocPtr) The document - d valid 10i 0 Temp check result + d valid like(xmlCint) Temp check result * * state state used for non-determinist content validation * d vstate * xmlValidState * - d vstateNr 10i 0 Validat. stack depth - d vstateMax 10i 0 Max stack depth + d vstateNr like(xmlCint) Validat. stack depth + d vstateMax like(xmlCint) Max stack depth d vstateTab * xmlValidState * * /if defined(LIBXML_REGEXP_ENABLED) @@ -189,9 +190,9 @@ d xmlSnprintfElementContent... d pr extproc('xmlSnprintfElementContent') d buf 65535 options(*varsize) - d size 10i 0 value + d size value like(xmlCint) d content value like(xmlElementContentPtr) - d englob 10i 0 value + d englob value like(xmlCint) /if defined(LIBXML_OUTPUT_ENABLED) * DEPRECATED @@ -199,7 +200,7 @@ d pr extproc('xmlSprintfElementContent') d buf 65535 options(*varsize) d content value like(xmlElementContentPtr) - d englob 10i 0 value + d englob value like(xmlCint) /endif LIBXML_OUTPUT_ENABLD * DEPRECATED @@ -311,12 +312,14 @@ d doc value like(xmlDocPtr) d ID * value options(*string) const xmlChar * - d xmlIsID pr 10i 0 extproc('xmlIsID') + d xmlIsID pr extproc('xmlIsID') + d like(xmlCint) d doc value like(xmlDocPtr) d node value like(xmlNodePtr) d attr value like(xmlAttrPtr) - d xmlRemoveID pr 10i 0 extproc('xmlRemoveID') + d xmlRemoveID pr extproc('xmlRemoveID') + d like(xmlCint) d doc value like(xmlDocPtr) d attr value like(xmlAttrPtr) @@ -333,12 +336,14 @@ d pr extproc('xmlFreeRefTable') d table value like(xmlRefTablePtr) - d xmlIsRef pr 10i 0 extproc('xmlIsRef') + d xmlIsRef pr extproc('xmlIsRef') + d like(xmlCint) d doc value like(xmlDocPtr) d node value like(xmlNodePtr) d attr value like(xmlAttrPtr) - d xmlRemoveRef pr 10i 0 extproc('xmlRemoveRef') + d xmlRemoveRef pr extproc('xmlRemoveRef') + d like(xmlCint) d doc value like(xmlDocPtr) d attr value like(xmlAttrPtr) @@ -361,12 +366,14 @@ d ctxt value like(xmlValidCtxtPtr) d xmlValidateRoot... - d pr 10i 0 extproc('xmlValidateRoot') + d pr extproc('xmlValidateRoot') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d xmlValidateElementDecl... - d pr 10i 0 extproc('xmlValidateElementDecl') + d pr extproc('xmlValidateElementDecl') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlElementPtr) @@ -389,51 +396,60 @@ d value * value options(*string) const xmlChar * d xmlValidateAttributeDecl... - d pr 10i 0 extproc('xmlValidateAttributeDecl') + d pr extproc('xmlValidateAttributeDecl') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d attr value like(xmlAttributePtr) d xmlValidateAttributeValue... - d pr 10i 0 extproc('xmlValidateAttributeValue') + d pr extproc('xmlValidateAttributeValue') + d like(xmlCint) d type value like(xmlAttributeType) d value * value options(*string) const xmlChar * d xmlValidateNotationDecl... - d pr 10i 0 extproc('xmlValidateNotationDecl') + d pr extproc('xmlValidateNotationDecl') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d nota value like(xmlNotationPtr) - d xmlValidateDtd pr 10i 0 extproc('xmlValidateDtd') + d xmlValidateDtd pr extproc('xmlValidateDtd') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d dtd value like(xmlDtdPtr) d xmlValidateDtdFinal... - d pr 10i 0 extproc('xmlValidateDtdFinal') + d pr extproc('xmlValidateDtdFinal') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d xmlValidateDocument... - d pr 10i 0 extproc('xmlValidateDocument') + d pr extproc('xmlValidateDocument') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d xmlValidateElement... - d pr 10i 0 extproc('xmlValidateElement') + d pr extproc('xmlValidateElement') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) d xmlValidateOneElement... - d pr 10i 0 extproc('xmlValidateOneElement') + d pr extproc('xmlValidateOneElement') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) d xmlValidateOneAttribute... - d pr 10i 0 extproc('xmlValidateOneAttribute') + d pr extproc('xmlValidateOneAttribute') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) @@ -441,7 +457,8 @@ d value * value options(*string) const xmlChar * d xmlValidateOneNamespace... - d pr 10i 0 extproc('xmlValidateOneNamespace') + d pr extproc('xmlValidateOneNamespace') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) @@ -450,7 +467,8 @@ d value * value options(*string) const xmlChar * d xmlValidateDocumentFinal... - d pr 10i 0 extproc('xmlValidateDocumentFinal') + d pr extproc('xmlValidateDocumentFinal') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) /endif LIBXML_VALID_ENABLED @@ -463,7 +481,8 @@ /endif /if defined(XML_TESTVAL) d xmlValidateNotationUse... - d pr 10i 0 extproc('xmlValidateNotationUse') + d pr extproc('xmlValidateNotationUse') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d notationName * value options(*string) const xmlChar * @@ -472,7 +491,8 @@ /endif d xmlIsMixedElement... - d pr 10i 0 extproc('xmlIsMixedElement') + d pr extproc('xmlIsMixedElement') + d like(xmlCint) d doc value like(xmlDocPtr) d name * value options(*string) const xmlChar * @@ -512,59 +532,69 @@ /if defined(LIBXML_VALID_ENABLED) d xmlValidGetPotentialChildren... - d pr 10i 0 extproc( + d pr extproc( d 'xmlValidGetPotentialChildren') + d like(xmlCint) d ctree * value xmlElementContent * d names * const xmlChar *(*) - d len 10i 0 - d max 10i 0 value + d len like(xmlCint) + d max value like(xmlCint) d xmlValidGetValidElements... - d pr 10i 0 extproc('xmlValidGetValidElements') + d pr extproc('xmlValidGetValidElements') + d like(xmlCint) d prev like(xmlNodePtr) d next like(xmlNodePtr) d names * const xmlChar *(*) - d max 10i 0 value + d max value like(xmlCint) d xmlValidateNameValue... - d pr 10i 0 extproc('xmlValidateNameValue') + d pr extproc('xmlValidateNameValue') + d like(xmlCint) d value * value options(*string) const xmlChar * d xmlValidateNamesValue... - d pr 10i 0 extproc('xmlValidateNamesValue') + d pr extproc('xmlValidateNamesValue') + d like(xmlCint) d value * value options(*string) const xmlChar * d xmlValidateNmtokenValue... - d pr 10i 0 extproc('xmlValidateNmtokenValue') + d pr extproc('xmlValidateNmtokenValue') + d like(xmlCint) d value * value options(*string) const xmlChar * d xmlValidateNmtokensValue... - d pr 10i 0 extproc('xmlValidateNmtokensValue') + d pr extproc('xmlValidateNmtokensValue') + d like(xmlCint) d value * value options(*string) const xmlChar * /if defined(LIBXML_REGEXP_ENABLED) * Validation based on the regexp support d xmlValidBuildContentModel... - d pr 10i 0 extproc('xmlValidBuildContentModel') + d pr extproc('xmlValidBuildContentModel') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d elem value like(xmlElementPtr) d xmlValidatePushElement... - d pr 10i 0 extproc('xmlValidatePushElement') + d pr extproc('xmlValidatePushElement') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) d qname * value options(*string) const xmlChar * d xmlValidatePushCData... - d pr 10i 0 extproc('xmlValidatePushCData') + d pr extproc('xmlValidatePushCData') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d data * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlValidatePopElement... - d pr 10i 0 extproc('xmlValidatePopElement') + d pr extproc('xmlValidatePopElement') + d like(xmlCint) d ctxt value like(xmlValidCtxtPtr) d doc value like(xmlDocPtr) d elem value like(xmlNodePtr) diff --git a/os400/libxmlrpg/xinclude.rpgle b/os400/libxmlrpg/xinclude.rpgle index c0b68ffe..93b7c515 100644 --- a/os400/libxmlrpg/xinclude.rpgle +++ b/os400/libxmlrpg/xinclude.rpgle @@ -12,6 +12,7 @@ /define XML_XINCLUDE_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/tree" /if defined(LIBXML_XINCLUDE_ENABLED) @@ -89,37 +90,43 @@ * standalone processing d xmlXIncludeProcess... - d pr 10i 0 extproc('xmlXIncludeProcess') + d pr extproc('xmlXIncludeProcess') + d like(xmlCint) d doc value like(xmlDocPtr) d xmlXIncludeProcessFlags... - d pr 10i 0 extproc('xmlXIncludeProcessFlags') + d pr extproc('xmlXIncludeProcessFlags') + d like(xmlCint) d doc value like(xmlDocPtr) - d flags 10i 0 value + d flags value like(xmlCint) d xmlXIncludeProcessFlagsData... - d pr 10i 0 extproc( + d pr extproc( d 'xmlXIncludeProcessFlagsData') + d like(xmlCint) d doc value like(xmlDocPtr) - d flags 10i 0 value + d flags value like(xmlCint) d data * value void * d xmlXIncludeProcessTreeFlagsData... - d pr 10i 0 extproc( + d pr extproc( d 'xmlXIncludeProcessTreeFlagsData') + d like(xmlCint) d tree value like(xmlNodePtr) - d flags 10i 0 value + d flags value like(xmlCint) d data * value void * d xmlXIncludeProcessTree... - d pr 10i 0 extproc('xmlXIncludeProcessTree') + d pr extproc('xmlXIncludeProcessTree') + d like(xmlCint) d tree value like(xmlNodePtr) d xmlXIncludeProcessTreeFlags... - d pr 10i 0 extproc( + d pr extproc( d 'xmlXIncludeProcessTreeFlags') + d like(xmlCint) d tree value like(xmlNodePtr) - d flags 10i 0 value + d flags value like(xmlCint) * contextual processing @@ -130,16 +137,18 @@ d doc value like(xmlDocPtr) d xmlXIncludeSetFlags... - d pr 10i 0 extproc('xmlXIncludeSetFlags') + d pr extproc('xmlXIncludeSetFlags') + d like(xmlCint) d ctxt value like(xmlXIncludeCtxtPtr) - d flags 10i 0 value + d flags value like(xmlCint) d xmlXIncludeFreeContext... d pr extproc('xmlXIncludeFreeContext') d ctxt value like(xmlXIncludeCtxtPtr) d xmlXIncludeProcessNode... - d pr 10i 0 extproc('xmlXIncludeProcessNode') + d pr extproc('xmlXIncludeProcessNode') + d like(xmlCint) d ctxt value like(xmlXIncludeCtxtPtr) d tree value like(xmlNodePtr) diff --git a/os400/libxmlrpg/xlink.rpgle b/os400/libxmlrpg/xlink.rpgle index 964e605f..e6ebdc64 100644 --- a/os400/libxmlrpg/xlink.rpgle +++ b/os400/libxmlrpg/xlink.rpgle @@ -9,10 +9,12 @@ /define XML_XLINK_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/tree" /if defined(LIBXML_XPTR_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/tree" + * Various defines for the various Link properties. * * NOTE: the link detection layer will try to resolve QName expansion @@ -26,7 +28,8 @@ d xlinkRole s * based(######typedef######) xmlChar * d xlinkTitle s * based(######typedef######) xmlChar * - d xlinkType s 10i 0 based(######typedef######) enum + d xlinkType s based(######typedef######) + d like(xmlCenum) d XLINK_TYPE_NONE... d c 0 d XLINK_TYPE_SIMPLE... @@ -36,7 +39,8 @@ d XLINK_TYPE_EXTENDED_SET... d c 3 - d xlinkShow s 10i 0 based(######typedef######) enum + d xlinkShow s based(######typedef######) + d like(xmlCenum) d XLINK_SHOW_NONE... d c 0 d XLINK_SHOW_NEW... @@ -46,7 +50,8 @@ d XLINK_SHOW_REPLACE... d c 3 - d xlinkActuate s 10i 0 based(######typedef######) enum + d xlinkActuate s based(######typedef######) + d like(xmlCenum) d XLINK_ACTUATE_NONE... d c 0 d XLINK_ACTUATE_AUTO... diff --git a/os400/libxmlrpg/xmlIO.rpgle b/os400/libxmlrpg/xmlIO.rpgle index 261b0e22..6c0afcc9 100644 --- a/os400/libxmlrpg/xmlIO.rpgle +++ b/os400/libxmlrpg/xmlIO.rpgle @@ -130,8 +130,8 @@ * d buffer like(xmlBufPtr) UTF-8 local buffer d raw like(xmlBufPtr) Raw input buffer - d compressed 10i 0 - d error 10i 0 + d compressed like(xmlCint) + d error like(xmlCint) d rawconsumed like(xmlCulong) /if defined(LIBXML_OUTPUT_ENABLED) @@ -146,8 +146,8 @@ * d buffer like(xmlBufPtr) UTF-8/ISOLatin local d conv like(xmlBufPtr) Buffer for output - d written 10i 0 Total # byte written - d error 10i 0 + d written like(xmlCint) Total # byte written + d error like(xmlCint) /endif LIBXML_OUTPUT_ENABLD * Interfaces for input @@ -156,7 +156,8 @@ d pr extproc('xmlCleanupInputCallbacks') d xmlPopInputCallbacks... - d pr 10i 0 extproc('xmlPopInputCallbacks') + d pr extproc('xmlPopInputCallbacks') + d like(xmlCint) d xmlRegisterDefaultInputCallbacks... d pr extproc( @@ -185,7 +186,7 @@ d pr extproc( d 'xmlParserInputBufferCreateFd') d like(xmlParserInputBufferPtr) - d fd 10i 0 value + d fd value like(xmlCint) d enc value like(xmlCharEncoding) d xmlParserInputBufferCreateMem... @@ -193,7 +194,7 @@ d 'xmlParserInputBufferCreateMem') d like(xmlParserInputBufferPtr) d mem * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d enc value like(xmlCharEncoding) d xmlParserInputBufferCreateStatic... @@ -201,7 +202,7 @@ d 'xmlParserInputBufferCreateStatic') d like(xmlParserInputBufferPtr) d mem * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d enc value like(xmlCharEncoding) d xmlParserInputBufferCreateIO... @@ -214,19 +215,22 @@ d enc value like(xmlCharEncoding) d xmlParserInputBufferRead... - d pr 10i 0 extproc('xmlParserInputBufferRead') + d pr extproc('xmlParserInputBufferRead') + d like(xmlCint) d in value like(xmlParserInputBufferPtr) - d len 10i 0 value + d len value like(xmlCint) d xmlParserInputBufferGrow... - d pr 10i 0 extproc('xmlParserInputBufferGrow') + d pr extproc('xmlParserInputBufferGrow') + d like(xmlCint) d in value like(xmlParserInputBufferPtr) - d len 10i 0 value + d len value like(xmlCint) d xmlParserInputBufferPush... - d pr 10i 0 extproc('xmlParserInputBufferPush') + d pr extproc('xmlParserInputBufferPush') + d like(xmlCint) d in value like(xmlParserInputBufferPtr) - d len 10i 0 value + d len value like(xmlCint) d buf * value options(*string) const char * d xmlFreeParserInputBuffer... @@ -238,7 +242,8 @@ d filename * value options(*string) const char * d xmlRegisterInputCallbacks... - d pr 10i 0 extproc('xmlRegisterInputCallbacks') + d pr extproc('xmlRegisterInputCallbacks') + d like(xmlCint) d matchFunc value like(xmlInputMatchCallback) d openFunc value like(xmlInputOpenCallback) d readFunc value like(xmlInputReadCallback) @@ -268,7 +273,7 @@ d URI * value options(*string) const char * d encoder value d like(xmlCharEncodingHandlerPtr) - d compression 10i 0 value + d compression value like(xmlCint) d xmlOutputBufferCreateFile... d pr extproc('xmlOutputBufferCreateFile') @@ -288,7 +293,7 @@ d xmlOutputBufferCreateFd... d pr extproc('xmlOutputBufferCreateFd') d like(xmlOutputBufferPtr) - d fd 10i 0 value + d fd value like(xmlCint) d encoder value d like(xmlCharEncodingHandlerPtr) @@ -313,32 +318,38 @@ d out value like(xmlOutputBufferPtr) d xmlOutputBufferWrite... - d pr 10i 0 extproc('xmlOutputBufferWrite') + d pr extproc('xmlOutputBufferWrite') + d like(xmlCint) d out value like(xmlOutputBufferPtr) - d len 10i 0 value + d len value like(xmlCint) d buf * value options(*string) const char * d xmlOutputBufferWriteString... - d pr 10i 0 extproc('xmlOutputBufferWriteString') + d pr extproc('xmlOutputBufferWriteString') + d like(xmlCint) d out value like(xmlOutputBufferPtr) d str * value options(*string) const char * d xmlOutputBufferWriteEscape... - d pr 10i 0 extproc('xmlOutputBufferWriteEscape') + d pr extproc('xmlOutputBufferWriteEscape') + d like(xmlCint) d out value like(xmlOutputBufferPtr) d str * value options(*string) const xmlChar * d escaping value like(xmlCharEncodingOutputFunc) d xmlOutputBufferFlush... - d pr 10i 0 extproc('xmlOutputBufferFlush') + d pr extproc('xmlOutputBufferFlush') + d like(xmlCint) d out value like(xmlOutputBufferPtr) d xmlOutputBufferClose... - d pr 10i 0 extproc('xmlOutputBufferClose') + d pr extproc('xmlOutputBufferClose') + d like(xmlCint) d out value like(xmlOutputBufferPtr) d xmlRegisterOutputCallbacks... - d pr 10i 0 extproc('xmlRegisterOutputCallbacks') + d pr extproc('xmlRegisterOutputCallbacks') + d like(xmlCint) d matchFunc value like(xmlOutputMatchCallback) d openFunc value like(xmlOutputOpenCallback) d writeFunc value like(xmlOutputWriteCallback) @@ -379,29 +390,34 @@ d path * value options(*string) const xmlChar * d xmlCheckFilename... - d pr 10i 0 extproc('xmlCheckFilename') + d pr extproc('xmlCheckFilename') + d like(xmlCint) d path * value options(*string) const char * * Default 'file://' protocol callbacks - d xmlFileMatch pr 10i 0 extproc('xmlFileMatch') + d xmlFileMatch pr extproc('xmlFileMatch') + d like(xmlCint) d filename * value options(*string) const char * d xmlFileOpen pr * extproc('xmlFileOpen') void * d filename * value options(*string) const char * - d xmlFileRead pr 10i 0 extproc('xmlFileRead') + d xmlFileRead pr extproc('xmlFileRead') + d like(xmlCint) d context * value void * d buffer 65535 options(*varsize) - d len 10i 0 value + d len value like(xmlCint) - d xmlFileClose pr 10i 0 extproc('xmlFileClose') + d xmlFileClose pr extproc('xmlFileClose') + d like(xmlCint) d context * value void * * Default 'http://' protocol callbacks /if defined(LIBXML_HTTP_ENABLED) - d xmlIOHTTPMatch pr 10i 0 extproc('xmlIOHTTPMatch') + d xmlIOHTTPMatch pr extproc('xmlIOHTTPMatch') + d like(xmlCint) d filename * value options(*string) const char * d xmlIOHTTPOpen pr * extproc('xmlIOHTTPOpen') void * @@ -410,33 +426,38 @@ /if defined(LIBXML_OUTPUT_ENABLED) d xmlIOHTTPOpenW pr * extproc('xmlIOHTTPOpenW') void * d post_uri * value options(*string) const char * - d compression 10i 0 value + d compression value like(xmlCint) /endif LIBXML_OUTPUT_ENABLD - d xmlIOHTTPRead pr 10i 0 extproc('xmlIOHTTPRead') + d xmlIOHTTPRead pr extproc('xmlIOHTTPRead') + d like(xmlCint) d context * value void * d buffer 65535 options(*varsize) - d len 10i 0 value + d len value like(xmlCint) - d xmlIOHTTPClose pr 10i 0 extproc('xmlIOHTTPClose') + d xmlIOHTTPClose pr extproc('xmlIOHTTPClose') + d like(xmlCint) d context * value void * /endif LIBXML_HTTP_ENABLED * Default 'ftp://' protocol callbacks /if defined(LIBXML_FTP_ENABLED) - d xmlIOFTPMatch pr 10i 0 extproc('xmlIOFTPMatch') + d xmlIOFTPMatch pr extproc('xmlIOFTPMatch') + d like(xmlCint) d filename * value options(*string) const char * d xmlIOFTPOpen pr * extproc('xmlIOFTPOpen') void * d filename * value options(*string) const char * - d xmlIOFTPRead pr 10i 0 extproc('xmlIOFTPRead') + d xmlIOFTPRead pr extproc('xmlIOFTPRead') + d like(xmlCint) d context * value void * d buffer 65535 options(*varsize) - d len 10i 0 value + d len value like(xmlCint) - d xmlIOFTPClose pr 10i 0 extproc('xmlIOFTPClose') + d xmlIOFTPClose pr extproc('xmlIOFTPClose') + d like(xmlCint) d context * value void * /endif LIBXML_FTP_ENABLED diff --git a/os400/libxmlrpg/xmlTypesC.rpgle b/os400/libxmlrpg/xmlTypesC.rpgle index 798d74d3..48a23bfc 100644 --- a/os400/libxmlrpg/xmlTypesC.rpgle +++ b/os400/libxmlrpg/xmlTypesC.rpgle @@ -20,5 +20,7 @@ d xmlCenum s 10i 0 based(######typedef######) d xmlCssize_t s 10i 0 based(######typedef######) d xmlCsize_t s 10u 0 based(######typedef######) + d xmlCfloat s 4f based(######typedef######) + d xmlCdouble s 8f based(######typedef######) /endif diff --git a/os400/libxmlrpg/xmlautomata.rpgle b/os400/libxmlrpg/xmlautomata.rpgle index 49797256..0e9cc223 100644 --- a/os400/libxmlrpg/xmlautomata.rpgle +++ b/os400/libxmlrpg/xmlautomata.rpgle @@ -9,11 +9,12 @@ /define XML_AUTOMATA_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/tree" /if defined(LIBXML_REGEXP_ENABLED) /if defined(LIBXML_AUTOMATA_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/tree" /include "libxmlrpg/xmlregexp" * xmlAutomataPtr: @@ -44,7 +45,8 @@ d am value like(xmlAutomataPtr) d xmlAutomataSetFinalState... - d pr 10i 0 extproc('xmlAutomataSetFinalState') + d pr extproc('xmlAutomataSetFinalState') + d like(xmlCint) d am value like(xmlAutomataPtr) d state value like(xmlAutomataStatePtr) @@ -89,8 +91,8 @@ d from value like(xmlAutomataStatePtr) d to value like(xmlAutomataStatePtr) d token * value options(*string) const xmlChar * - d min 10i 0 value - d max 10i 0 value + d min value like(xmlCint) + d max value like(xmlCint) d data * value options(*string) void * d xmlAutomataNewCountTrans2... @@ -101,8 +103,8 @@ d to value like(xmlAutomataStatePtr) d token * value options(*string) const xmlChar * d token2 * value options(*string) const xmlChar * - d min 10i 0 value - d max 10i 0 value + d min value like(xmlCint) + d max value like(xmlCint) d data * value options(*string) void * d xmlAutomataNewOnceTrans... @@ -112,8 +114,8 @@ d from value like(xmlAutomataStatePtr) d to value like(xmlAutomataStatePtr) d token * value options(*string) const xmlChar * - d min 10i 0 value - d max 10i 0 value + d min value like(xmlCint) + d max value like(xmlCint) d data * value options(*string) void * d xmlAutomataNewOnceTrans2... @@ -124,8 +126,8 @@ d to value like(xmlAutomataStatePtr) d token * value options(*string) const xmlChar * d token2 * value options(*string) const xmlChar * - d min 10i 0 value - d max 10i 0 value + d min value like(xmlCint) + d max value like(xmlCint) d data * value options(*string) void * d xmlAutomataNewAllTrans... @@ -134,7 +136,7 @@ d am value like(xmlAutomataPtr) d from value like(xmlAutomataStatePtr) d to value like(xmlAutomataStatePtr) - d lax 10i 0 value + d lax value like(xmlCint) d xmlAutomataNewEpsilon... d pr extproc('xmlAutomataNewEpsilon') @@ -149,7 +151,7 @@ d am value like(xmlAutomataPtr) d from value like(xmlAutomataStatePtr) d to value like(xmlAutomataStatePtr) - d counter 10i 0 value + d counter value like(xmlCint) d xmlAutomataNewCounterTrans... d pr extproc('xmlAutomataNewCounterTrans') @@ -157,13 +159,14 @@ d am value like(xmlAutomataPtr) d from value like(xmlAutomataStatePtr) d to value like(xmlAutomataStatePtr) - d counter 10i 0 value + d counter value like(xmlCint) d xmlAutomataNewCounter... - d pr 10i 0 extproc('xmlAutomataNewCounter') + d pr extproc('xmlAutomataNewCounter') + d like(xmlCint) d am value like(xmlAutomataPtr) - d min 10i 0 value - d max 10i 0 value + d min value like(xmlCint) + d max value like(xmlCint) d xmlAutomataCompile... d pr extproc('xmlAutomataCompile') @@ -171,7 +174,8 @@ d am value like(xmlAutomataPtr) d xmlAutomataIsDeterminist... - d pr 10i 0 extproc('xmlAutomataIsDeterminist') + d pr extproc('xmlAutomataIsDeterminist') + d like(xmlCint) d am value like(xmlAutomataPtr) /endif AUTOMATA_ENABLED diff --git a/os400/libxmlrpg/xmlerror.rpgle b/os400/libxmlrpg/xmlerror.rpgle index b77caad4..6688b37b 100644 --- a/os400/libxmlrpg/xmlerror.rpgle +++ b/os400/libxmlrpg/xmlerror.rpgle @@ -5,16 +5,18 @@ * * Author: Patrick Monnerat <pm@datasphere.ch>, DATASPHERE S.A. - /include "libxmlrpg/parser" - /if not defined(XML_ERROR_H__) /define XML_ERROR_H__ + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/parser" + * xmlErrorLevel: * * Indicates the level of an error - d xmlErrorLevel s 10i 0 based(######typedef######) enum + d xmlErrorLevel s based(######typedef######) + d like(xmlCenum) d XML_ERR_NONE c 0 d XML_ERR_WARNING... A simple warning d c 1 @@ -25,7 +27,8 @@ * * Indicates where an error may have come from - d xmlErrorDomain s 10i 0 based(######typedef######) enum + d xmlErrorDomain s based(######typedef######) + d like(xmlCenum) d XML_FROM_NONE c 0 d XML_FROM_PARSER... XML parser d c 1 @@ -86,17 +89,17 @@ d xmlError ds based(xmlErrorPtr) d align qualified - d domain 10i 0 Libpart raising err - d code 10i 0 Error code + d domain like(xmlCint) Libpart raising err + d code like(xmlCint) Error code d message * char * d level like(xmlErrorLevel) Error severity d file * File name - d line 10i 0 Line number + d line like(xmlCint) Line number d str1 * char * d str2 * char * d str3 * char * - d int1 10i 0 Extra number info - d int2 10i 0 Error column + d int1 like(xmlCint) Extra number info + d int2 like(xmlCint) Error column d ctxt * void * d node * void * @@ -105,7 +108,8 @@ * This is an error that the XML (or HTML) parser can generate d xmlParserErrors... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_ERR_OK c 0 d XML_ERR_INTERNAL_ERROR... d c 1 @@ -1674,7 +1678,8 @@ d xmlResetError pr extproc('xmlResetError') d err value like(xmlErrorPtr) - d xmlCopyError pr 10i 0 extproc('xmlCopyError') + d xmlCopyError pr extproc('xmlCopyError') + d like(xmlCint) d from value like(xmlErrorPtr) d to value like(xmlErrorPtr) diff --git a/os400/libxmlrpg/xmlmemory.rpgle b/os400/libxmlrpg/xmlmemory.rpgle index 3c791038..472e9410 100644 --- a/os400/libxmlrpg/xmlmemory.rpgle +++ b/os400/libxmlrpg/xmlmemory.rpgle @@ -136,19 +136,22 @@ * The xmlGc function have an extra entry for atomic block * allocations useful for garbage collected memory allocators - d xmlMemSetup pr 10i 0 extproc('xmlMemSetup') + d xmlMemSetup pr extproc('xmlMemSetup') + d like(xmlCint) d freeFunc value like(xmlFreeFunc) d mallocFunc value like(xmlMallocFunc) d reallocFunc value like(xmlReallocFunc) d strdupFunc value like(xmlStrdupFunc) - d xmlMemGet pr 10i 0 extproc('xmlMemGet') + d xmlMemGet pr extproc('xmlMemGet') + d like(xmlCint) d freeFunc like(xmlFreeFunc) d mallocFunc like(xmlMallocFunc) d reallocFunc like(xmlReallocFunc) d strdupFunc like(xmlStrdupFunc) - d xmlGcMemSetup pr 10i 0 extproc('xmlGcMemSetup') + d xmlGcMemSetup pr extproc('xmlGcMemSetup') + d like(xmlCint) d freeFunc value like(xmlFreeFunc) d mallocFunc value like(xmlMallocFunc) d mallocAtomicFunc... @@ -156,7 +159,8 @@ d reallocFunc value like(xmlReallocFunc) d strdupFunc value like(xmlStrdupFunc) - d xmlGcMemGet pr 10i 0 extproc('xmlGcMemGet') + d xmlGcMemGet pr extproc('xmlGcMemGet') + d like(xmlCint) d freeFunc like(xmlFreeFunc) d mallocFunc like(xmlMallocFunc) d mallocAtomicFunc... @@ -166,7 +170,8 @@ * Initialization of the memory layer. - d xmlInitMemory pr 10i 0 extproc('xmlInitMemory') + d xmlInitMemory pr extproc('xmlInitMemory') + d like(xmlCint) * Cleanup of the memory layer. @@ -175,9 +180,11 @@ * These are specific to the XML debug memory wrapper. - d xmlMemUsed pr 10i 0 extproc('xmlMemUsed') + d xmlMemUsed pr extproc('xmlMemUsed') + d like(xmlCint) - d xmlMemBlocks pr 10i 0 extproc('xmlMemBlocks') + d xmlMemBlocks pr extproc('xmlMemBlocks') + d like(xmlCint) d xmlMemDisplay pr extproc('xmlMemDisplay') d fp * value FILE * @@ -189,7 +196,7 @@ d xmlMemShow pr extproc('xmlMemShow') d fp * value FILE * - d nr 10i 0 value + d nr value like(xmlCint) d xmlMemoryDump pr extproc('xmlMemoryDump') @@ -210,25 +217,25 @@ d xmlMallocLoc pr * extproc('xmlMallocLoc') void * d size value like(xmlCsize_t) d file * value options(*string) const char * - d line 10i 0 value + d line value like(xmlCint) d xmlReallocLoc pr * extproc('xmlReallocLoc') void * d ptr * value void * d size value like(xmlCsize_t) d file * value options(*string) const char * - d line 10i 0 value + d line value like(xmlCint) d xmlMallocAtomicLoc... d pr * extproc('xmlMallocAtomicLoc') void * d size value like(xmlCsize_t) d file * value options(*string) const char * - d line 10i 0 value + d line value like(xmlCint) d xmlMemStrdupLoc... d pr * extproc('xmlMemStrdupLoc') char * d str * value options(*string) const char * d file * value options(*string) const char * - d line 10i 0 value + d line value like(xmlCint) /if not defined(XML_GLOBALS_H) /if not defined(XML_THREADS_H__) diff --git a/os400/libxmlrpg/xmlmodule.rpgle b/os400/libxmlrpg/xmlmodule.rpgle index 09592a6a..035254d6 100644 --- a/os400/libxmlrpg/xmlmodule.rpgle +++ b/os400/libxmlrpg/xmlmodule.rpgle @@ -13,6 +13,8 @@ /if defined(LIBXML_MODULES_ENABLED) + /include "libxmlrpg/xmlTypesC" + * xmlModulePtr: * * A handle to a dynamically loaded module @@ -24,7 +26,8 @@ * enumeration of options that can be passed down to xmlModuleOpen() d xmlModuleOption... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_MODULE_LAZY... Lazy binding d c 1 d XML_MODULE_LOCAL... Local binding @@ -33,18 +36,21 @@ d xmlModuleOpen pr extproc('xmlModuleOpen') d like(xmlModulePtr) d filename * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlModuleSymbol... - d pr 10i 0 extproc('xmlModuleSymbol') + d pr extproc('xmlModuleSymbol') + d like(xmlCint) d module value like(xmlModulePtr) d name * value options(*string) const char * d result * void *(*) - d xmlModuleClose pr 10i 0 extproc('xmlModuleClose') + d xmlModuleClose pr extproc('xmlModuleClose') + d like(xmlCint) d module value like(xmlModulePtr) - d xmlModuleFree pr 10i 0 extproc('xmlModuleFree') + d xmlModuleFree pr extproc('xmlModuleFree') + d like(xmlCint) d module value like(xmlModulePtr) /endif LIBXML_MODULES_ENBLD diff --git a/os400/libxmlrpg/xmlreader.rpgle b/os400/libxmlrpg/xmlreader.rpgle index 5084fc86..9ec76b3b 100644 --- a/os400/libxmlrpg/xmlreader.rpgle +++ b/os400/libxmlrpg/xmlreader.rpgle @@ -24,7 +24,8 @@ * is used. d xmlParserSeverities... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_PARSER_SEVERITY_VALIDITY_WARNING... d c 1 d XML_PARSER_SEVERITY_VALIDITY_ERROR... @@ -41,7 +42,8 @@ * Internal state values for the reader. d xmlTextReaderMode... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_TEXTREADER_MODE_INITIAL... d c 0 d XML_TEXTREADER_MODE_INTERACTIVE... @@ -62,7 +64,8 @@ * xmlReaderForxxx APIs now. d xmlParserProperties... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_PARSER_LOADDTD... d c 1 d XML_PARSER_DEFAULTATTRS... @@ -76,7 +79,8 @@ * * Predefined constants for the different types of nodes. - d xmlReaderTypes s 10i 0 based(######typedef######) enum + d xmlReaderTypes s based(######typedef######) + d like(xmlCenum) d XML_READER_TYPE_NONE... d c 0 d XML_READER_TYPE_ELEMENT... @@ -139,17 +143,19 @@ d reader value like(xmlTextReaderPtr) d xmlTextReaderSetup... - d pr 10i 0 extproc('xmlTextReaderSetup') + d pr extproc('xmlTextReaderSetup') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d input value like(xmlParserInputBufferPtr) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) * Iterators d xmlTextReaderRead... - d pr 10i 0 extproc('xmlTextReaderRead') + d pr extproc('xmlTextReaderRead') + d like(xmlCint) d reader value like(xmlTextReaderPtr) /if defined(LIBXML_WRITER_ENABLED) @@ -167,53 +173,64 @@ d reader value like(xmlTextReaderPtr) d xmlTextReaderReadAttributeValue... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderReadAttributeValue') + d like(xmlCint) d reader value like(xmlTextReaderPtr) * Attributes of the node d xmlTextReaderAttributeCount... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderAttributeCount') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderDepth... - d pr 10i 0 extproc('xmlTextReaderDepth') + d pr extproc('xmlTextReaderDepth') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderHasAttributes... - d pr 10i 0 extproc('xmlTextReaderHasAttributes') + d pr extproc('xmlTextReaderHasAttributes') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderHasValue... - d pr 10i 0 extproc('xmlTextReaderHasValue') + d pr extproc('xmlTextReaderHasValue') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderIsDefault... - d pr 10i 0 extproc('xmlTextReaderIsDefault') + d pr extproc('xmlTextReaderIsDefault') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderIsEmptyElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderIsEmptyElement') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderNodeType... - d pr 10i 0 extproc('xmlTextReaderNodeType') + d pr extproc('xmlTextReaderNodeType') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderQuoteChar... - d pr 10i 0 extproc('xmlTextReaderQuoteChar') + d pr extproc('xmlTextReaderQuoteChar') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderReadState... - d pr 10i 0 extproc('xmlTextReaderReadState') + d pr extproc('xmlTextReaderReadState') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderIsNamespaceDecl... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderIsNamespaceDecl') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderConstBaseUri... @@ -285,14 +302,15 @@ * Methods of the XmlTextReader d xmlTextReaderClose... - d pr 10i 0 extproc('xmlTextReaderClose') + d pr extproc('xmlTextReaderClose') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderGetAttributeNo... d pr * extproc( xmlChar * d 'xmlTextReaderGetAttributeNo') d reader value like(xmlTextReaderPtr) - d no 10i 0 value + d no value like(xmlCint) d xmlTextReaderGetAttribute... d pr * extproc('xmlTextReaderGetAttribute') xmlChar * @@ -318,40 +336,47 @@ d prefix * value options(*string) const xmlChar * d xmlTextReaderMoveToAttributeNo... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderMoveToAttributeNo') + d like(xmlCint) d reader value like(xmlTextReaderPtr) - d no 10i 0 value + d no value like(xmlCint) d xmlTextReaderMoveToAttribute... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderMoveToAttribute') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d name * value options(*string) const xmlChar * d xmlTextReaderMoveToAttributeNs... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderMoveToAttributeNs') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d localName * value options(*string) const xmlChar * d namespaceURI * value options(*string) const xmlChar * d xmlTextReaderMoveToFirstAttribute... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderMoveToFirstAttribute') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderMoveToNextAttribute... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderMoveToNextAttribute') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderMoveToElement... - d pr 10i 0 extproc('xmlTextReaderMoveToElement') + d pr extproc('xmlTextReaderMoveToElement') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderNormalization... - d pr 10i 0 extproc('xmlTextReaderNormalization') + d pr extproc('xmlTextReaderNormalization') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderConstEncoding... @@ -361,15 +386,17 @@ * Extensions d xmlTextReaderSetParserProp... - d pr 10i 0 extproc('xmlTextReaderSetParserProp') + d pr extproc('xmlTextReaderSetParserProp') + d like(xmlCint) d reader value like(xmlTextReaderPtr) - d prop 10i 0 value - d value 10i 0 value + d prop value like(xmlCint) + d value value like(xmlCint) d xmlTextReaderGetParserProp... - d pr 10i 0 extproc('xmlTextReaderGetParserProp') + d pr extproc('xmlTextReaderGetParserProp') + d like(xmlCint) d reader value like(xmlTextReaderPtr) - d prop 10i 0 value + d prop value like(xmlCint) d xmlTextReaderCurrentNode... d pr extproc('xmlTextReaderCurrentNode') @@ -377,13 +404,15 @@ d reader value like(xmlTextReaderPtr) d xmlTextReaderGetParserLineNumber... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderGetParserLineNumber') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderGetParserColumnNumber... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderGetParserColumnNumber') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderPreserve... @@ -393,8 +422,9 @@ /if defined(LIBXML_PATTERN_ENABLED) d xmlTextReaderPreservePattern... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderPreservePattern') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d pattern * value options(*string) const xmlChar * d namespaces * const xmlChar *(*) @@ -411,52 +441,61 @@ d reader value like(xmlTextReaderPtr) d xmlTextReaderNext... - d pr 10i 0 extproc('xmlTextReaderNext') + d pr extproc('xmlTextReaderNext') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderNextSibling... - d pr 10i 0 extproc('xmlTextReaderNextSibling') + d pr extproc('xmlTextReaderNextSibling') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xmlTextReaderIsValid... - d pr 10i 0 extproc('xmlTextReaderIsValid') + d pr extproc('xmlTextReaderIsValid') + d like(xmlCint) d reader value like(xmlTextReaderPtr) /if defined(LIBXML_SCHEMAS_ENABLED) d xmlTextReaderRelaxNGValidate... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderRelaxNGValidate') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d rng * value options(*string) const char * d xmlTextReaderRelaxNGValidateCtxt... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderRelaxNGValidateCtxt') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d ctxt value like(xmlRelaxNGValidCtxtPtr) - d options 10i 0 value + d options value like(xmlCint) d xmlTextReaderRelaxNGSetSchema... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderRelaxNGSetSchema') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d schema value like(xmlRelaxNGPtr) d xmlTextReaderSchemaValidate... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderSchemaValidate') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d xsd * value options(*string) const char * d xmlTextReaderSchemaValidateCtxt... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderSchemaValidateCtxt') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d ctxt value like(xmlSchemaValidCtxtPtr) - d options 10i 0 value + d options value like(xmlCint) d xmlTextReaderSetSchema... - d pr 10i 0 extproc('xmlTextReaderSetSchema') + d pr extproc('xmlTextReaderSetSchema') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d schema value like(xmlSchemaPtr) /endif @@ -467,7 +506,8 @@ d reader value like(xmlTextReaderPtr) d xmlTextReaderStandalone... - d pr 10i 0 extproc('xmlTextReaderStandalone') + d pr extproc('xmlTextReaderStandalone') + d like(xmlCint) d reader value like(xmlTextReaderPtr) * Index lookup @@ -490,30 +530,30 @@ d cur * value options(*string) const xmlChar * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReaderForFile... d pr extproc('xmlReaderForFile') d like(xmlTextReaderPtr) d filename * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReaderForMemory... d pr extproc('xmlReaderForMemory') d like(xmlTextReaderPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReaderForFd pr extproc('xmlReaderForFd') d like(xmlTextReaderPtr) - d fd 10i 0 value + d fd value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReaderForIO pr extproc('xmlReaderForIO') d like(xmlTextReaderPtr) @@ -522,52 +562,58 @@ d ioctx * value void * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReaderNewWalker... - d pr 10i 0 extproc('xmlReaderNewWalker') + d pr extproc('xmlReaderNewWalker') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d doc value like(xmlDocPtr) d xmlReaderNewDoc... - d pr 10i 0 extproc('xmlReaderNewDoc') + d pr extproc('xmlReaderNewDoc') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d cur * value options(*string) const xmlChar * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReaderNewFile... - d pr 10i 0 extproc('xmlReaderNewFile') + d pr extproc('xmlReaderNewFile') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d filename * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlReaderNewMemory... - d pr 10i 0 extproc('xmlReaderNewMemory') + d pr extproc('xmlReaderNewMemory') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) - d xmlReaderNewFd pr 10i 0 extproc('xmlReaderNewFd') + d xmlReaderNewFd pr extproc('xmlReaderNewFd') + d like(xmlCint) d reader value like(xmlTextReaderPtr) - d fd 10i 0 value + d fd value like(xmlCint) d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) - d xmlReaderNewIO pr 10i 0 extproc('xmlReaderNewIO') + d xmlReaderNewIO pr extproc('xmlReaderNewIO') + d like(xmlCint) d reader value like(xmlTextReaderPtr) d ioread value like(xmlInputReadCallback) d ioclose value like(xmlInputCloseCallback) d ioctx * value void * d URL * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) * Error handling extensions @@ -587,8 +633,9 @@ d procptr d xmlTextReaderLocatorLineNumber... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextReaderLocatorLineNumber') + d like(xmlCint) d locator value like(xmlTextReaderLocatorPtr) d xmlTextReaderLocatorBaseURI... diff --git a/os400/libxmlrpg/xmlregexp.rpgle b/os400/libxmlrpg/xmlregexp.rpgle index 65c2d077..01d411a7 100644 --- a/os400/libxmlrpg/xmlregexp.rpgle +++ b/os400/libxmlrpg/xmlregexp.rpgle @@ -13,6 +13,8 @@ /if defined(LIBXML_REGEXP_ENABLED) + /include "libxmlrpg/xmlTypesC" + * xmlRegexpPtr: * * A libxml regular expression, they can actually be far more complex @@ -41,7 +43,8 @@ d pr extproc('xmlRegFreeRegexp') d regexp value like(xmlRegexpPtr) - d xmlRegexpExec pr 10i 0 extproc('xmlRegexpExec') + d xmlRegexpExec pr extproc('xmlRegexpExec') + d like(xmlCint) d comp value like(xmlRegexpPtr) d value * value options(*string) const xmlChar * @@ -50,7 +53,8 @@ d regexp value like(xmlRegexpPtr) d xmlRegexpIsDeterminist... - d pr 10i 0 extproc('xmlRegexpIsDeterminist') + d pr extproc('xmlRegexpIsDeterminist') + d like(xmlCint) d comp value like(xmlRegexpPtr) * xmlRegExecCallbacks: @@ -79,34 +83,38 @@ d exec value like(xmlRegExecCtxtPtr) d xmlRegExecPushString... - d pr 10i 0 extproc('xmlRegExecPushString') + d pr extproc('xmlRegExecPushString') + d like(xmlCint) d exec value like(xmlRegExecCtxtPtr) d value * value options(*string) const xmlChar * d data * value void * d xmlRegExecPushString2... - d pr 10i 0 extproc('xmlRegExecPushString2') + d pr extproc('xmlRegExecPushString2') + d like(xmlCint) d exec value like(xmlRegExecCtxtPtr) d value * value options(*string) const xmlChar * d value2 * value options(*string) const xmlChar * d data * value void * d xmlRegExecNextValues... - d pr 10i 0 extproc('xmlRegExecNextValues') + d pr extproc('xmlRegExecNextValues') + d like(xmlCint) d exec value like(xmlRegExecCtxtPtr) - d nbval 10i 0 - d nbneg 10i 0 + d nbval like(xmlCint) + d nbneg like(xmlCint) d values * xmlChar * (*) - d terminal 10i 0 + d terminal like(xmlCint) d xmlRegExecErrInfo... - d pr 10i 0 extproc('xmlRegExecErrInfo') + d pr extproc('xmlRegExecErrInfo') + d like(xmlCint) d exec value like(xmlRegExecCtxtPtr) d string * const xmlChar * (*) - d nbval 10i 0 - d nbneg 10i 0 + d nbval like(xmlCint) + d nbneg like(xmlCint) d values * xmlChar * (*) - d terminal 10i 0 + d terminal like(xmlCint) /if defined(LIBXML_EXPR_ENABLED) @@ -122,22 +130,25 @@ d xmlExpNewCtxt pr extproc('xmlExpNewCtxt') d like(xmlExpCtxtPtr) - d maxNodes 10i 0 value + d maxNodes value like(xmlCint) d dict value like(xmlDictPtr) d xmlExpCtxtNbNodes... - d pr 10i 0 extproc('xmlExpCtxtNbNodes') + d pr extproc('xmlExpCtxtNbNodes') + d like(xmlCint) d ctxt value like(xmlExpCtxtPtr) d xmlExpCtxtNbCons... - d pr 10i 0 extproc('xmlExpCtxtNbCons') + d pr extproc('xmlExpCtxtNbCons') + d like(xmlCint) d ctxt value like(xmlExpCtxtPtr) * Expressions are trees but the tree is opaque d xmlExpNodePtr s * based(######typedef######) - d xmlExpNodeType s 10i 0 based(######typedef######) enum + d xmlExpNodeType s based(######typedef######) + d like(xmlCenum) d XML_EXP_EMPTY c 0 d XML_EXP_FORBID... d c 1 @@ -175,7 +186,7 @@ d like(xmlExpNodePtr) d ctxt value like(xmlExpCtxtPtr) d name * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlExpNewOr pr extproc('xmlExpNewOr') d like(xmlExpNodePtr) @@ -193,30 +204,34 @@ d like(xmlExpNodePtr) d ctxt value like(xmlExpCtxtPtr) d subset value like(xmlExpNodePtr) - d min 10i 0 value - d max 10i 0 value + d min value like(xmlCint) + d max value like(xmlCint) * The really interesting APIs d xmlExpIsNillable... - d pr 10i 0 extproc('xmlExpIsNillable') + d pr extproc('xmlExpIsNillable') + d like(xmlCint) d expr value like(xmlExpNodePtr) - d xmlExpMaxToken pr 10i 0 extproc('xmlExpMaxToken') + d xmlExpMaxToken pr extproc('xmlExpMaxToken') + d like(xmlCint) d expr value like(xmlExpNodePtr) d xmlExpGetLanguage... - d pr 10i 0 extproc('xmlExpGetLanguage') + d pr extproc('xmlExpGetLanguage') + d like(xmlCint) d ctxt value like(xmlExpCtxtPtr) d expr value like(xmlExpNodePtr) d langList * const xmlChar *(*) - d len 10i 0 value + d len value like(xmlCint) - d xmlExpGetStart pr 10i 0 extproc('xmlExpGetStart') + d xmlExpGetStart pr extproc('xmlExpGetStart') + d like(xmlCint) d ctxt value like(xmlExpCtxtPtr) d expr value like(xmlExpNodePtr) d tokList * const xmlChar *(*) - d len 10i 0 value + d len value like(xmlCint) d xmlExpStringDerive... d pr extproc('xmlExpStringDerive') @@ -224,7 +239,7 @@ d ctxt value like(xmlExpCtxtPtr) d expr value like(xmlExpNodePtr) d str * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlExpExpDerive... d pr extproc('xmlExpExpDerive') @@ -233,7 +248,8 @@ d expr value like(xmlExpNodePtr) d sub value like(xmlExpNodePtr) - d xmlExpSubsume pr 10i 0 extproc('xmlExpSubsume') + d xmlExpSubsume pr extproc('xmlExpSubsume') + d like(xmlCint) d ctxt value like(xmlExpCtxtPtr) d expr value like(xmlExpNodePtr) d sub value like(xmlExpNodePtr) diff --git a/os400/libxmlrpg/xmlsave.rpgle b/os400/libxmlrpg/xmlsave.rpgle index 764dceb6..ad0d15d5 100644 --- a/os400/libxmlrpg/xmlsave.rpgle +++ b/os400/libxmlrpg/xmlsave.rpgle @@ -9,19 +9,21 @@ /define XML_XMLSAVE_H__ /include "libxmlrpg/xmlversion" + + /if defined(LIBXML_OUTPUT_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/tree" /include "libxmlrpg/encoding" /include "libxmlrpg/xmlIO" - /if defined(LIBXML_OUTPUT_ENABLED) - * xmlSaveOption: * * This is the set of XML save options that can be passed down * to the xmlSaveToFd() and similar calls. - d xmlSaveOption s 10i 0 based(######typedef######) enum + d xmlSaveOption s based(######typedef######) + d like(xmlCenum) d XML_SAVE_FORMAT... Format save output d c X'0001' d XML_SAVE_NO_DECL... Drop xml declaration @@ -43,23 +45,23 @@ d xmlSaveToFd pr extproc('xmlSaveToFd') d like(xmlSaveCtxtPtr) - d fd 10i 0 value + d fd value like(xmlCint) d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlSaveToFilename... d pr extproc('xmlSaveToFilename') d like(xmlSaveCtxtPtr) d filename * value options(*string) const char * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlSaveToBuffer... d pr extproc('xmlSaveToBuffer') d like(xmlSaveCtxtPtr) d buffer value like(xmlBufferPtr) d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlSaveToIO pr extproc('xmlSaveToIO') d like(xmlSaveCtxtPtr) @@ -67,7 +69,7 @@ d ioclose value like(xmlOutputCloseCallback) d ioctx * value void * d encoding * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlSaveDoc pr extproc('xmlSaveDoc') d like(xmlClong) @@ -79,19 +81,23 @@ d ctxt value like(xmlSaveCtxtPtr) d node value like(xmlNodePtr) - d xmlSaveFlush pr 10i 0 extproc('xmlSaveFlush') + d xmlSaveFlush pr extproc('xmlSaveFlush') + d like(xmlCint) d ctxt value like(xmlSaveCtxtPtr) - d xmlSaveClose pr 10i 0 extproc('xmlSaveClose') + d xmlSaveClose pr extproc('xmlSaveClose') + d like(xmlCint) d ctxt value like(xmlSaveCtxtPtr) d xmlSaveSetEscape... - d pr 10i 0 extproc('xmlSaveSetEscape') + d pr extproc('xmlSaveSetEscape') + d like(xmlCint) d ctxt value like(xmlSaveCtxtPtr) d escape value like(xmlCharEncodingOutputFunc) d xmlSaveSetAttrEscape... - d pr 10i 0 extproc('xmlSaveSetAttrEscape') + d pr extproc('xmlSaveSetAttrEscape') + d like(xmlCint) d ctxt value like(xmlSaveCtxtPtr) d escape value like(xmlCharEncodingOutputFunc) diff --git a/os400/libxmlrpg/xmlschemas.rpgle b/os400/libxmlrpg/xmlschemas.rpgle index 865dd262..f34ddcd3 100644 --- a/os400/libxmlrpg/xmlschemas.rpgle +++ b/os400/libxmlrpg/xmlschemas.rpgle @@ -13,12 +13,14 @@ /if defined(LIBXML_SCHEMAS_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/tree" * This error codes are obsolete; not used any more. d xmlSchemaValidError... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_SCHEMAS_ERR_OK... d c 0 d XML_SCHEMAS_ERR_NOROOT... @@ -81,7 +83,8 @@ * This is the set of XML Schema validation options. d xmlSchemaValidOption... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) * * Default/fixed: create an attribute node * or an element's text node on the instance. @@ -158,7 +161,7 @@ d pr extproc('xmlSchemaNewMemParserCtxt') d like(xmlSchemaParserCtxtPtr) d buffer * value options(*string) const char * - d size 10i 0 value + d size value like(xmlCint) d xmlSchemaNewDocParserCtxt... d pr extproc('xmlSchemaNewDocParserCtxt') @@ -186,14 +189,16 @@ d ctx * value void * d xmlSchemaGetParserErrors... - d pr 10i 0 extproc('xmlSchemaGetParserErrors') + d pr extproc('xmlSchemaGetParserErrors') + d like(xmlCint) d ctxt value like(xmlSchemaParserCtxtPtr) d err like(xmlSchemaValidityErrorFunc) d warn like(xmlSchemaValidityWarningFunc) d ctx * void *(*) d xmlSchemaIsValid... - d pr 10i 0 extproc('xmlSchemaIsValid') + d pr extproc('xmlSchemaIsValid') + d like(xmlCint) d ctxt value like(xmlSchemaValidCtxtPtr) d xmlSchemaParse pr extproc('xmlSchemaParse') @@ -228,16 +233,18 @@ d ctx * value void * d xmlSchemaGetValidErrors... - d pr 10i 0 extproc('xmlSchemaGetValidErrors') + d pr extproc('xmlSchemaGetValidErrors') + d like(xmlCint) d ctxt value like(xmlSchemaValidCtxtPtr) d err like(xmlSchemaValidityErrorFunc) d warn like(xmlSchemaValidityWarningFunc) d ctx * void *(*) d xmlSchemaSetValidOptions... - d pr 10i 0 extproc('xmlSchemaSetValidOptions') + d pr extproc('xmlSchemaSetValidOptions') + d like(xmlCint) d ctxt value like(xmlSchemaValidCtxtPtr) - d options 10i 0 value + d options value like(xmlCint) d xmlSchemaValidateSetFilename... d pr extproc( @@ -246,8 +253,9 @@ d filename * value options(*string) const char * d xmlSchemaValidCtxtGetOptions... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaValidCtxtGetOptions') + d like(xmlCint) d ctxt value like(xmlSchemaValidCtxtPtr) d xmlSchemaNewValidCtxt... @@ -260,18 +268,21 @@ d ctxt value like(xmlSchemaValidCtxtPtr) d xmlSchemaValidateDoc... - d pr 10i 0 extproc('xmlSchemaValidateDoc') + d pr extproc('xmlSchemaValidateDoc') + d like(xmlCint) d ctxt value like(xmlSchemaValidCtxtPtr) d instance value like(xmlDocPtr) d xmlSchemaValidateOneElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaValidateOneElement') + d like(xmlCint) d ctxt value like(xmlSchemaValidCtxtPtr) d elem value like(xmlNodePtr) d xmlSchemaValidateStream... - d pr 10i 0 extproc('xmlSchemaValidateStream') + d pr extproc('xmlSchemaValidateStream') + d like(xmlCint) d ctxt value like(xmlSchemaValidCtxtPtr) d input value like(xmlParserInputBufferPtr) d enc value like(xmlCharEncoding) @@ -279,10 +290,11 @@ d user_data * value void * d xmlSchemaValidateFile... - d pr 10i 0 extproc('xmlSchemaValidateFile') + d pr extproc('xmlSchemaValidateFile') + d like(xmlCint) d ctxt value like(xmlSchemaValidCtxtPtr) d filename * value options(*string) const char * - d options 10i 0 value + d options value like(xmlCint) d xmlSchemaValidCtxtGetParserCtxt... d pr extproc( @@ -303,7 +315,8 @@ d user_data * void *(*) d xmlSchemaSAXUnplug... - d pr 10i 0 extproc('xmlSchemaSAXUnplug') + d pr extproc('xmlSchemaSAXUnplug') + d like(xmlCint) d plug value like(xmlSchemaSAXPlugPtr) d xmlSchemaValidateSetLocator... diff --git a/os400/libxmlrpg/xmlschemastypes.rpgle b/os400/libxmlrpg/xmlschemastypes.rpgle index 0bf0f709..ecd6aba3 100644 --- a/os400/libxmlrpg/xmlschemastypes.rpgle +++ b/os400/libxmlrpg/xmlschemastypes.rpgle @@ -10,15 +10,16 @@ /define XML_SCHEMA_TYPES_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/xmlTypesC" /if defined(LIBXML_SCHEMAS_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/schemasInternals" /include "libxmlrpg/xmlschemas" d xmlSchemaWhitespaceValueType... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XML_SCHEMA_WHITESPACE_UNKNOWN... d c 0 d XML_SCHEMA_WHITESPACE_PRESERVE... @@ -41,29 +42,33 @@ d ns * value options(*string) const xmlChar * d xmlSchemaValidatePredefinedType... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaValidatePredefinedType') + d like(xmlCint) d type value like(xmlSchemaTypePtr) d value * value options(*string) const xmlChar * d val * value xmlSchemaValPtr * d xmlSchemaValPredefTypeNode... - d pr 10i 0 extproc('xmlSchemaValPredefTypeNode') + d pr extproc('xmlSchemaValPredefTypeNode') + d like(xmlCint) d type value like(xmlSchemaTypePtr) d value * value options(*string) const xmlChar * d val * value xmlSchemaValPtr * d node value like(xmlNodePtr) d xmlSchemaValidateFacet... - d pr 10i 0 extproc('xmlSchemaValidateFacet') + d pr extproc('xmlSchemaValidateFacet') + d like(xmlCint) d base value like(xmlSchemaTypePtr) d facet value like(xmlSchemaFacetPtr) d value * value options(*string) const xmlChar * d val value like(xmlSchemaValPtr) d xmlSchemaValidateFacetWhtsp... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaValidateFacetWhtsp') + d like(xmlCint) d facet value like(xmlSchemaFacetPtr) d fws value d like(xmlSchemaWhitespaceValueType) @@ -82,7 +87,8 @@ d like(xmlSchemaFacetPtr) d xmlSchemaCheckFacet... - d pr 10i 0 extproc('xmlSchemaCheckFacet') + d pr extproc('xmlSchemaCheckFacet') + d like(xmlCint) d facet value like(xmlSchemaFacetPtr) d typeDecl value like(xmlSchemaTypePtr) d ctxt value like(xmlSchemaParserCtxtPtr) @@ -93,7 +99,8 @@ d facet value like(xmlSchemaFacetPtr) d xmlSchemaCompareValues... - d pr 10i 0 extproc('xmlSchemaCompareValues') + d pr extproc('xmlSchemaCompareValues') + d like(xmlCint) d x value like(xmlSchemaValPtr) d y value like(xmlSchemaValPtr) @@ -104,8 +111,9 @@ d type value like(xmlSchemaTypePtr) d xmlSchemaValidateListSimpleTypeFacet... - d pr 10i 0 extproc('xmlSchemaValidateListSimple- + d pr extproc('xmlSchemaValidateListSimple- d TypeFacet') + d like(xmlCint) d facet value like(xmlSchemaFacetPtr) d value * value options(*string) const xmlChar * d actualLen value like(xmlCulong) @@ -117,10 +125,11 @@ d type value like(xmlSchemaValType) d xmlSchemaIsBuiltInTypeFacet... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaIsBuiltInTypeFacet') + d like(xmlCint) d type value like(xmlSchemaTypePtr) - d facetType 10i 0 value + d facetType value like(xmlCint) d xmlSchemaCollapseString... d pr * extproc('xmlSchemaCollapseString') xmlChar * @@ -137,8 +146,9 @@ d facet value like(xmlSchemaFacetPtr) d xmlSchemaValidateLengthFacet... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaValidateLengthFacet') + d like(xmlCint) d type value like(xmlSchemaTypePtr) d facet value like(xmlSchemaFacetPtr) d value * value options(*string) const xmlChar * @@ -146,8 +156,9 @@ d length like(xmlCulong) d xmlSchemaValidateLengthFacetWhtsp... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaValidateLengthFacetWhtsp') + d like(xmlCint) d facet value like(xmlSchemaFacetPtr) d valType value like(xmlSchemaValType) d value * value options(*string) const xmlChar * @@ -157,28 +168,32 @@ d like(xmlSchemaWhitespaceValueType) d xmlSchemaValPredefTypeNodeNoNorm... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaValPredefTypeNodeNoNorm') + d like(xmlCint) d type value like(xmlSchemaTypePtr) d value * value options(*string) const xmlChar * d val like(xmlSchemaValPtr) d node value like(xmlNodePtr) d xmlSchemaGetCanonValue... - d pr 10i 0 extproc('xmlSchemaGetCanonValue') + d pr extproc('xmlSchemaGetCanonValue') + d like(xmlCint) d val value like(xmlSchemaValPtr) d retValue * value const xmlChar * * d xmlSchemaGetCanonValueWhtsp... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaGetCanonValueWhtsp') + d like(xmlCint) d val value like(xmlSchemaValPtr) d retValue * value const xmlChar * * d ws value d like(xmlSchemaWhitespaceValueType) d xmlSchemaValueAppend... - d pr 10i 0 extproc('xmlSchemaValueAppend') + d pr extproc('xmlSchemaValueAppend') + d like(xmlCint) d prev value like(xmlSchemaValPtr) d cur value like(xmlSchemaValPtr) @@ -192,7 +207,8 @@ d val value like(xmlSchemaValPtr) d xmlSchemaValueGetAsBoolean... - d pr 10i 0 extproc('xmlSchemaValueGetAsBoolean') + d pr extproc('xmlSchemaValueGetAsBoolean') + d like(xmlCint) d val value like(xmlSchemaValPtr) d xmlSchemaNewStringValue... @@ -214,8 +230,9 @@ d localName * value options(*string) const xmlChar * d xmlSchemaCompareValuesWhtsp... - d pr 10i 0 extproc( + d pr extproc( d 'xmlSchemaCompareValuesWhtsp') + d like(xmlCint) d x value like(xmlSchemaValPtr) d xws value d like(xmlSchemaWhitespaceValueType) diff --git a/os400/libxmlrpg/xmlstdarg.rpgle b/os400/libxmlrpg/xmlstdarg.rpgle index 9e45a4c8..3c8e200f 100644 --- a/os400/libxmlrpg/xmlstdarg.rpgle +++ b/os400/libxmlrpg/xmlstdarg.rpgle @@ -8,6 +8,7 @@ /define XML_STDARG_H__ /include "libxmlrpg/xmlversion" + /include "libxmlrpg/xmlTypesC" * The va_list object. @@ -21,12 +22,12 @@ d xmlVaStart pr extproc('__xmlVaStart') d list likeds(xmlVaList) d lastargaddr * value - d lastargsize 10u 0 value + d lastargsize value like(xmlCsize_t) d xmlVaArg pr * extproc('__xmlVaArg') d list likeds(xmlVaList) d dest * value - d argsize 10i 0 value + d argsize value like(xmlCsize_t) d xmlVaEnd pr extproc('__xmlVaEnd') d list likeds(xmlVaList) diff --git a/os400/libxmlrpg/xmlstring.rpgle b/os400/libxmlrpg/xmlstring.rpgle index 5b863e45..8980fc04 100644 --- a/os400/libxmlrpg/xmlstring.rpgle +++ b/os400/libxmlrpg/xmlstring.rpgle @@ -29,19 +29,19 @@ d xmlStrndup pr * extproc('xmlStrndup') xmlChar * d cur * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlCharStrndup pr * extproc('xmlCharStrndup') xmlChar * d cur * value options(*string) const char * - d len 10i 0 value + d len value like(xmlCint) d xmlCharStrdup pr * extproc('xmlCharStrdup') xmlChar * d cur * value options(*string) const char * d xmlStrsub pr * extproc('xmlStrsub') const xmlChar * d str * value options(*string) const xmlChar * - d start 10i 0 value - d len 10i 0 value + d start value like(xmlCint) + d len value like(xmlCint) d xmlStrchr pr * extproc('xmlStrchr') const xmlChar * d str * value options(*string) const xmlChar * @@ -55,34 +55,41 @@ d str * value options(*string) const xmlChar * d val * value options(*string) const xmlChar * - d xmlStrcmp pr 10i 0 extproc('xmlStrcmp') + d xmlStrcmp pr extproc('xmlStrcmp') + d like(xmlCint) d str1 * value options(*string) const xmlChar * d str2 * value options(*string) const xmlChar * - d xmlStrncmp pr 10i 0 extproc('xmlStrncmp') + d xmlStrncmp pr extproc('xmlStrncmp') + d like(xmlCint) d str1 * value options(*string) const xmlChar * d str2 * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) - d xmlStrcasecmp pr 10i 0 extproc('xmlStrcasecmp') + d xmlStrcasecmp pr extproc('xmlStrcasecmp') + d like(xmlCint) d str1 * value options(*string) const xmlChar * d str2 * value options(*string) const xmlChar * - d xmlStrncasecmp pr 10i 0 extproc('xmlStrncasecmp') + d xmlStrncasecmp pr extproc('xmlStrncasecmp') + d like(xmlCint) d str1 * value options(*string) const xmlChar * d str2 * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) - d xmlStrEqual pr 10i 0 extproc('xmlStrEqual') + d xmlStrEqual pr extproc('xmlStrEqual') + d like(xmlCint) d str1 * value options(*string) const xmlChar * d str2 * value options(*string) const xmlChar * - d xmlStrQEqual pr 10i 0 extproc('xmlStrQEqual') + d xmlStrQEqual pr extproc('xmlStrQEqual') + d like(xmlCint) d pref * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * d stre * value options(*string) const xmlChar * - d xmlStrlen pr 10i 0 extproc('xmlStrlen') + d xmlStrlen pr extproc('xmlStrlen') + d like(xmlCint) d str * value options(*string) const xmlChar * d xmlStrcat pr * extproc('xmlStrcat') xmlChar * @@ -92,21 +99,22 @@ d xmlStrncat pr * extproc('xmlStrncat') xmlChar * d cur * value options(*string) xmlChar * d add * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlStrncatNew pr * extproc('xmlStrncatNew') xmlChar * d str1 * value options(*string) const xmlChar * d str2 * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) * xmlStrPrintf() is a vararg function. * The following prototype supports up to 8 pointer arguments. * Other argument signature can be achieved by defining alternate * prototypes redirected to the same function. - d xmlStrPrintf pr 10i 0 extproc('xmlStrPrintf') + d xmlStrPrintf pr extproc('xmlStrPrintf') + d like(xmlCint) d buf * value options(*string) xmlChar * - d len 10i 0 value + d len value like(xmlCint) d msg * value options(*string) const xmlChar * d arg1 * value options(*string: *nopass) d arg2 * value options(*string: *nopass) @@ -117,47 +125,55 @@ d arg7 * value options(*string: *nopass) d arg8 * value options(*string: *nopass) - d xmlStrVPrintf pr 10i 0 extproc('xmlStrVPrintf') + d xmlStrVPrintf pr extproc('xmlStrVPrintf') + d like(xmlCint) d buf * value options(*string) xmlChar * - d len 10i 0 value + d len value like(xmlCint) d msg * value options(*string) const xmlChar * d ap likeds(xmlVaList) - d xmlGetUTF8Char pr 10i 0 extproc('xmlGetUTF8Char') + d xmlGetUTF8Char pr extproc('xmlGetUTF8Char') + d like(xmlCint) d utf * value options(*string) const uns. char * - d len 10i 0 + d len like(xmlCint) - d xmlCheckUTF8 pr 10i 0 extproc('xmlCheckUTF8') + d xmlCheckUTF8 pr extproc('xmlCheckUTF8') + d like(xmlCint) d utf * value options(*string) const uns. char * - d xmlUTF8Strsize pr 10i 0 extproc('xmlUTF8Strsize') + d xmlUTF8Strsize pr extproc('xmlUTF8Strsize') + d like(xmlCint) d utf * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlUTF8Strndup pr * extproc('xmlUTF8Strndup') xmlChar * d utf * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlUTF8Strpos pr * extproc('xmlUTF8Strpos') const xmlChar * d utf * value options(*string) const xmlChar * - d pos 10i 0 value + d pos value like(xmlCint) - d xmlUTF8Strloc pr 10i 0 extproc('xmlUTF8Strloc') + d xmlUTF8Strloc pr extproc('xmlUTF8Strloc') + d like(xmlCint) d utf * value options(*string) const xmlChar * d utfchar * value options(*string) const xmlChar * d xmlUTF8Strsub pr * extproc('xmlUTF8Strsub') xmlChar * d utf * value options(*string) const xmlChar * - d start 10i 0 value - d len 10i 0 value + d start value like(xmlCint) + d len value like(xmlCint) - d xmlUTF8Strlen pr 10i 0 extproc('xmlUTF8Strlen') + d xmlUTF8Strlen pr extproc('xmlUTF8Strlen') + d like(xmlCint) d utf * value options(*string) const xmlChar * - d xmlUTF8Size pr 10i 0 extproc('xmlUTF8Size') + d xmlUTF8Size pr extproc('xmlUTF8Size') + d like(xmlCint) d utf * value options(*string) const xmlChar * - d xmlUTF8Charcmp pr 10i 0 extproc('xmlUTF8Charcmp') + d xmlUTF8Charcmp pr extproc('xmlUTF8Charcmp') + d like(xmlCint) d utf1 * value options(*string) const xmlChar * d utf2 * value options(*string) const xmlChar * diff --git a/os400/libxmlrpg/xmlunicode.rpgle b/os400/libxmlrpg/xmlunicode.rpgle index 64f7abfb..c4c4ba1f 100644 --- a/os400/libxmlrpg/xmlunicode.rpgle +++ b/os400/libxmlrpg/xmlunicode.rpgle @@ -12,656 +12,824 @@ /if defined(LIBXML_UNICODE_ENABLED) + /include "libxmlrpg/xmlTypesC" + d xmlUCSIsAegeanNumbers... - d pr 10i 0 extproc('xmlUCSIsAegeanNumbers') - d code 10i 0 value + d pr extproc('xmlUCSIsAegeanNumbers') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsAlphabeticPresentationForms... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsAlphabeticPresentationForms' d ) - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsArabic pr 10i 0 extproc('xmlUCSIsArabic') - d code 10i 0 value + d xmlUCSIsArabic pr extproc('xmlUCSIsArabic') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsArabicPresentationFormsA... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsArabicPresentationFormsA') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsArabicPresentationFormsB... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsArabicPresentationFormsB') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsArmenian... - d pr 10i 0 extproc('xmlUCSIsArmenian') - d code 10i 0 value + d pr extproc('xmlUCSIsArmenian') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsArrows pr 10i 0 extproc('xmlUCSIsArrows') - d code 10i 0 value + d xmlUCSIsArrows pr extproc('xmlUCSIsArrows') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsBasicLatin... - d pr 10i 0 extproc('xmlUCSIsBasicLatin') - d code 10i 0 value + d pr extproc('xmlUCSIsBasicLatin') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsBengali... - d pr 10i 0 extproc('xmlUCSIsBengali') - d code 10i 0 value + d pr extproc('xmlUCSIsBengali') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsBlockElements... - d pr 10i 0 extproc('xmlUCSIsBlockElements') - d code 10i 0 value + d pr extproc('xmlUCSIsBlockElements') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsBopomofo... - d pr 10i 0 extproc('xmlUCSIsBopomofo') - d code 10i 0 value + d pr extproc('xmlUCSIsBopomofo') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsBopomofoExtended... - d pr 10i 0 extproc('xmlUCSIsBopomofoExtended') - d code 10i 0 value + d pr extproc('xmlUCSIsBopomofoExtended') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsBoxDrawing... - d pr 10i 0 extproc('xmlUCSIsBoxDrawing') - d code 10i 0 value + d pr extproc('xmlUCSIsBoxDrawing') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsBraillePatterns... - d pr 10i 0 extproc('xmlUCSIsBraillePatterns') - d code 10i 0 value + d pr extproc('xmlUCSIsBraillePatterns') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsBuhid pr 10i 0 extproc('xmlUCSIsBuhid') - d code 10i 0 value + d xmlUCSIsBuhid pr extproc('xmlUCSIsBuhid') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsByzantineMusicalSymbols... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsByzantineMusicalSymbols') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKCompatibility... - d pr 10i 0 extproc('xmlUCSIsCJKCompatibility') - d code 10i 0 value + d pr extproc('xmlUCSIsCJKCompatibility') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKCompatibilityForms... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsCJKCompatibilityForms') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKCompatibilityIdeographs... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsCJKCompatibilityIdeographs') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKCompatibilityIdeographsSupplement... - d pr 10i 0 extproc('xmlUCSIsCJKCompatibilityIde- + d pr extproc('xmlUCSIsCJKCompatibilityIde- d ographsSupplement') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKRadicalsSupplement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsCJKRadicalsSupplement') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKSymbolsandPunctuation... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsCJKSymbolsandPunctuation') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKUnifiedIdeographs... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsCJKUnifiedIdeographs') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKUnifiedIdeographsExtensionA... - d pr 10i 0 extproc('xmlUCSIsCJKUnifiedIdeograph- + d pr extproc('xmlUCSIsCJKUnifiedIdeograph- d sExtensionA') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCJKUnifiedIdeographsExtensionB... - d pr 10i 0 extproc('xmlUCSIsCJKUnifiedIdeograph- + d pr extproc('xmlUCSIsCJKUnifiedIdeograph- d sExtensionB') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCherokee... - d pr 10i 0 extproc('xmlUCSIsCherokee') - d code 10i 0 value + d pr extproc('xmlUCSIsCherokee') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCombiningDiacriticalMarks... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsCombiningDiacriticalMarks') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCombiningDiacriticalMarksforSymbols... - d pr 10i 0 extproc('xmlUCSIsCombiningDiacritica- + d pr extproc('xmlUCSIsCombiningDiacritica- d lMarksforSymbols') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCombiningHalfMarks... - d pr 10i 0 extproc('xmlUCSIsCombiningHalfMarks') - d code 10i 0 value + d pr extproc('xmlUCSIsCombiningHalfMarks') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCombiningMarksforSymbols... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsCombiningMarksforSymbols') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsControlPictures... - d pr 10i 0 extproc('xmlUCSIsControlPictures') - d code 10i 0 value + d pr extproc('xmlUCSIsControlPictures') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCurrencySymbols... - d pr 10i 0 extproc('xmlUCSIsCurrencySymbols') - d code 10i 0 value + d pr extproc('xmlUCSIsCurrencySymbols') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCypriotSyllabary... - d pr 10i 0 extproc('xmlUCSIsCypriotSyllabary') - d code 10i 0 value + d pr extproc('xmlUCSIsCypriotSyllabary') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCyrillic... - d pr 10i 0 extproc('xmlUCSIsCyrillic') - d code 10i 0 value + d pr extproc('xmlUCSIsCyrillic') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsCyrillicSupplement... - d pr 10i 0 extproc('xmlUCSIsCyrillicSupplement') - d code 10i 0 value + d pr extproc('xmlUCSIsCyrillicSupplement') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsDeseret... - d pr 10i 0 extproc('xmlUCSIsDeseret') - d code 10i 0 value + d pr extproc('xmlUCSIsDeseret') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsDevanagari... - d pr 10i 0 extproc('xmlUCSIsDevanagari') - d code 10i 0 value + d pr extproc('xmlUCSIsDevanagari') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsDingbats... - d pr 10i 0 extproc('xmlUCSIsDingbats') - d code 10i 0 value + d pr extproc('xmlUCSIsDingbats') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsEnclosedAlphanumerics... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsEnclosedAlphanumerics') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsEnclosedCJKLettersandMonths... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsEnclosedCJKLettersandMonths' d ) - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsEthiopic... - d pr 10i 0 extproc('xmlUCSIsEthiopic') - d code 10i 0 value + d pr extproc('xmlUCSIsEthiopic') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsGeneralPunctuation... - d pr 10i 0 extproc('xmlUCSIsGeneralPunctuation') - d code 10i 0 value + d pr extproc('xmlUCSIsGeneralPunctuation') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsGeometricShapes... - d pr 10i 0 extproc('xmlUCSIsGeometricShapes') - d code 10i 0 value + d pr extproc('xmlUCSIsGeometricShapes') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsGeorgian... - d pr 10i 0 extproc('xmlUCSIsGeorgian') - d code 10i 0 value + d pr extproc('xmlUCSIsGeorgian') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsGothic pr 10i 0 extproc('xmlUCSIsGothic') - d code 10i 0 value + d xmlUCSIsGothic pr extproc('xmlUCSIsGothic') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsGreek pr 10i 0 extproc('xmlUCSIsGreek') - d code 10i 0 value + d xmlUCSIsGreek pr extproc('xmlUCSIsGreek') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsGreekExtended... - d pr 10i 0 extproc('xmlUCSIsGreekExtended') - d code 10i 0 value + d pr extproc('xmlUCSIsGreekExtended') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsGreekandCoptic... - d pr 10i 0 extproc('xmlUCSIsGreekandCoptic') - d code 10i 0 value + d pr extproc('xmlUCSIsGreekandCoptic') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsGujarati... - d pr 10i 0 extproc('xmlUCSIsGujarati') - d code 10i 0 value + d pr extproc('xmlUCSIsGujarati') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsGurmukhi... - d pr 10i 0 extproc('xmlUCSIsGurmukhi') - d code 10i 0 value + d pr extproc('xmlUCSIsGurmukhi') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsHalfwidthandFullwidthForms... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsHalfwidthandFullwidthForms') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsHangulCompatibilityJamo... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsHangulCompatibilityJamo') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsHangulJamo... - d pr 10i 0 extproc('xmlUCSIsHangulJamo') - d code 10i 0 value + d pr extproc('xmlUCSIsHangulJamo') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsHangulSyllables... - d pr 10i 0 extproc('xmlUCSIsHangulSyllables') - d code 10i 0 value + d pr extproc('xmlUCSIsHangulSyllables') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsHanunoo... - d pr 10i 0 extproc('xmlUCSIsHanunoo') - d code 10i 0 value + d pr extproc('xmlUCSIsHanunoo') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsHebrew pr 10i 0 extproc('xmlUCSIsHebrew') - d code 10i 0 value + d xmlUCSIsHebrew pr extproc('xmlUCSIsHebrew') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsHighPrivateUseSurrogates... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsHighPrivateUseSurrogates') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsHighSurrogates... - d pr 10i 0 extproc('xmlUCSIsHighSurrogates') - d code 10i 0 value + d pr extproc('xmlUCSIsHighSurrogates') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsHiragana... - d pr 10i 0 extproc('xmlUCSIsHiragana') - d code 10i 0 value + d pr extproc('xmlUCSIsHiragana') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsIPAExtensions... - d pr 10i 0 extproc('xmlUCSIsIPAExtensions') - d code 10i 0 value + d pr extproc('xmlUCSIsIPAExtensions') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsIdeographicDescriptionCharacters... - d pr 10i 0 extproc('xmlUCSIsIdeographicDescript- + d pr extproc('xmlUCSIsIdeographicDescript- d ionCharacters') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsKanbun pr 10i 0 extproc('xmlUCSIsKanbun') - d code 10i 0 value + d xmlUCSIsKanbun pr extproc('xmlUCSIsKanbun') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsKangxiRadicals... - d pr 10i 0 extproc('xmlUCSIsKangxiRadicals') - d code 10i 0 value + d pr extproc('xmlUCSIsKangxiRadicals') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsKannada... - d pr 10i 0 extproc('xmlUCSIsKannada') - d code 10i 0 value + d pr extproc('xmlUCSIsKannada') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsKatakana... - d pr 10i 0 extproc('xmlUCSIsKatakana') - d code 10i 0 value + d pr extproc('xmlUCSIsKatakana') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsKatakanaPhoneticExtensions... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsKatakanaPhoneticExtensions') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsKhmer pr 10i 0 extproc('xmlUCSIsKhmer') - d code 10i 0 value + d xmlUCSIsKhmer pr extproc('xmlUCSIsKhmer') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsKhmerSymbols... - d pr 10i 0 extproc('xmlUCSIsKhmerSymbols') - d code 10i 0 value + d pr extproc('xmlUCSIsKhmerSymbols') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsLao pr 10i 0 extproc('xmlUCSIsLao') - d code 10i 0 value + d xmlUCSIsLao pr extproc('xmlUCSIsLao') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsLatin1Supplement... - d pr 10i 0 extproc('xmlUCSIsLatin1Supplement') - d code 10i 0 value + d pr extproc('xmlUCSIsLatin1Supplement') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsLatinExtendedA... - d pr 10i 0 extproc('xmlUCSIsLatinExtendedA') - d code 10i 0 value + d pr extproc('xmlUCSIsLatinExtendedA') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsLatinExtendedB... - d pr 10i 0 extproc('xmlUCSIsLatinExtendedB') - d code 10i 0 value + d pr extproc('xmlUCSIsLatinExtendedB') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsLatinExtendedAdditional... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsLatinExtendedAdditional') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsLetterlikeSymbols... - d pr 10i 0 extproc('xmlUCSIsLetterlikeSymbols') - d code 10i 0 value + d pr extproc('xmlUCSIsLetterlikeSymbols') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsLimbu pr 10i 0 extproc('xmlUCSIsLimbu') - d code 10i 0 value + d xmlUCSIsLimbu pr extproc('xmlUCSIsLimbu') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsLinearBIdeograms... - d pr 10i 0 extproc('xmlUCSIsLinearBIdeograms') - d code 10i 0 value + d pr extproc('xmlUCSIsLinearBIdeograms') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsLinearBSyllabary... - d pr 10i 0 extproc('xmlUCSIsLinearBSyllabary') - d code 10i 0 value + d pr extproc('xmlUCSIsLinearBSyllabary') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsLowSurrogates... - d pr 10i 0 extproc('xmlUCSIsLowSurrogates') - d code 10i 0 value + d pr extproc('xmlUCSIsLowSurrogates') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMalayalam... - d pr 10i 0 extproc('xmlUCSIsMalayalam') - d code 10i 0 value + d pr extproc('xmlUCSIsMalayalam') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMathematicalAlphanumericSymbols... - d pr 10i 0 extproc('xmlUCSIsMathematicalAlphanu- + d pr extproc('xmlUCSIsMathematicalAlphanu- d mericSymbols') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMathematicalOperators... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsMathematicalOperators') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMiscellaneousMathematicalSymbolsA... - d pr 10i 0 extproc('xmlUCSIsMiscellaneousMathem- + d pr extproc('xmlUCSIsMiscellaneousMathem- d aticalSymbolsA') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMiscellaneousMathematicalSymbolsB... - d pr 10i 0 extproc('xmlUCSIsMiscellaneousMathem- + d pr extproc('xmlUCSIsMiscellaneousMathem- d aticalSymbolsB') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMiscellaneousSymbols... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsMiscellaneousSymbols') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMiscellaneousSymbolsandArrows... - d pr 10i 0 extproc('xmlUCSIsMiscellaneousSymbol- + d pr extproc('xmlUCSIsMiscellaneousSymbol- d sandArrows') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMiscellaneousTechnical... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsMiscellaneousTechnical') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMongolian... - d pr 10i 0 extproc('xmlUCSIsMongolian') - d code 10i 0 value + d pr extproc('xmlUCSIsMongolian') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMusicalSymbols... - d pr 10i 0 extproc('xmlUCSIsMusicalSymbols') - d code 10i 0 value + d pr extproc('xmlUCSIsMusicalSymbols') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsMyanmar... - d pr 10i 0 extproc('xmlUCSIsMyanmar') - d code 10i 0 value + d pr extproc('xmlUCSIsMyanmar') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsNumberForms... - d pr 10i 0 extproc('xmlUCSIsNumberForms') - d code 10i 0 value + d pr extproc('xmlUCSIsNumberForms') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsOgham pr 10i 0 extproc('xmlUCSIsOgham') - d code 10i 0 value + d xmlUCSIsOgham pr extproc('xmlUCSIsOgham') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsOldItalic... - d pr 10i 0 extproc('xmlUCSIsOldItalic') - d code 10i 0 value + d pr extproc('xmlUCSIsOldItalic') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsOpticalCharacterRecognition... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsOpticalCharacterRecognition' d ) - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsOriya pr 10i 0 extproc('xmlUCSIsOriya') - d code 10i 0 value + d xmlUCSIsOriya pr extproc('xmlUCSIsOriya') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsOsmanya... - d pr 10i 0 extproc('xmlUCSIsOsmanya') - d code 10i 0 value + d pr extproc('xmlUCSIsOsmanya') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsPhoneticExtensions... - d pr 10i 0 extproc('xmlUCSIsPhoneticExtensions') - d code 10i 0 value + d pr extproc('xmlUCSIsPhoneticExtensions') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsPrivateUse... - d pr 10i 0 extproc('xmlUCSIsPrivateUse') - d code 10i 0 value + d pr extproc('xmlUCSIsPrivateUse') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsPrivateUseArea... - d pr 10i 0 extproc('xmlUCSIsPrivateUseArea') - d code 10i 0 value + d pr extproc('xmlUCSIsPrivateUseArea') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsRunic pr 10i 0 extproc('xmlUCSIsRunic') - d code 10i 0 value + d xmlUCSIsRunic pr extproc('xmlUCSIsRunic') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsShavian... - d pr 10i 0 extproc('xmlUCSIsShavian') - d code 10i 0 value + d pr extproc('xmlUCSIsShavian') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSinhala... - d pr 10i 0 extproc('xmlUCSIsSinhala') - d code 10i 0 value + d pr extproc('xmlUCSIsSinhala') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSmallFormVariants... - d pr 10i 0 extproc('xmlUCSIsSmallFormVariants') - d code 10i 0 value + d pr extproc('xmlUCSIsSmallFormVariants') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSpacingModifierLetters... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsSpacingModifierLetters') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSpecials... - d pr 10i 0 extproc('xmlUCSIsSpecials') - d code 10i 0 value + d pr extproc('xmlUCSIsSpecials') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSuperscriptsandSubscripts... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsSuperscriptsandSubscripts') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSupplementalArrowsA... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsSupplementalArrowsA') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSupplementalArrowsB... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsSupplementalArrowsB') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSupplementalMathematicalOperators... - d pr 10i 0 extproc('xmlUCSIsSupplementalMathema- + d pr extproc('xmlUCSIsSupplementalMathema- d ticalOperators') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSupplementaryPrivateUseAreaA... - d pr 10i 0 extproc('xmlUCSIsSupplementaryPrivat- + d pr extproc('xmlUCSIsSupplementaryPrivat- d eUseAreaA') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsSupplementaryPrivateUseAreaB... - d pr 10i 0 extproc('xmlUCSIsSupplementaryPrivat- + d pr extproc('xmlUCSIsSupplementaryPrivat- d eUseAreaB') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsSyriac pr 10i 0 extproc('xmlUCSIsSyriac') - d code 10i 0 value + d xmlUCSIsSyriac pr extproc('xmlUCSIsSyriac') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsTagalog... - d pr 10i 0 extproc('xmlUCSIsTagalog') - d code 10i 0 value + d pr extproc('xmlUCSIsTagalog') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsTagbanwa... - d pr 10i 0 extproc('xmlUCSIsTagbanwa') - d code 10i 0 value + d pr extproc('xmlUCSIsTagbanwa') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsTags pr 10i 0 extproc('xmlUCSIsTags') - d code 10i 0 value + d xmlUCSIsTags pr extproc('xmlUCSIsTags') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsTaiLe pr 10i 0 extproc('xmlUCSIsTaiLe') - d code 10i 0 value + d xmlUCSIsTaiLe pr extproc('xmlUCSIsTaiLe') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsTaiXuanJingSymbols... - d pr 10i 0 extproc('xmlUCSIsTaiXuanJingSymbols') - d code 10i 0 value + d pr extproc('xmlUCSIsTaiXuanJingSymbols') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsTamil pr 10i 0 extproc('xmlUCSIsTamil') - d code 10i 0 value + d xmlUCSIsTamil pr extproc('xmlUCSIsTamil') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsTelugu pr 10i 0 extproc('xmlUCSIsTelugu') - d code 10i 0 value + d xmlUCSIsTelugu pr extproc('xmlUCSIsTelugu') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsThaana pr 10i 0 extproc('xmlUCSIsThaana') - d code 10i 0 value + d xmlUCSIsThaana pr extproc('xmlUCSIsThaana') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsThai pr 10i 0 extproc('xmlUCSIsThai') - d code 10i 0 value + d xmlUCSIsThai pr extproc('xmlUCSIsThai') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsTibetan... - d pr 10i 0 extproc('xmlUCSIsTibetan') - d code 10i 0 value + d pr extproc('xmlUCSIsTibetan') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsUgaritic... - d pr 10i 0 extproc('xmlUCSIsUgaritic') - d code 10i 0 value + d pr extproc('xmlUCSIsUgaritic') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsUnifiedCanadianAboriginalSyllabics... - d pr 10i 0 extproc('xmlUCSIsUnifiedCanadianAbor- + d pr extproc('xmlUCSIsUnifiedCanadianAbor- d iginalSyllabics') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsVariationSelectors... - d pr 10i 0 extproc('xmlUCSIsVariationSelectors') - d code 10i 0 value + d pr extproc('xmlUCSIsVariationSelectors') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsVariationSelectorsSupplement... - d pr 10i 0 extproc('xmlUCSIsVariationSelectorsS- + d pr extproc('xmlUCSIsVariationSelectorsS- d upplement') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsYiRadicals... - d pr 10i 0 extproc('xmlUCSIsYiRadicals') - d code 10i 0 value + d pr extproc('xmlUCSIsYiRadicals') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsYiSyllables... - d pr 10i 0 extproc('xmlUCSIsYiSyllables') - d code 10i 0 value + d pr extproc('xmlUCSIsYiSyllables') + d like(xmlCint) + d code value like(xmlCint) d xmlUCSIsYijingHexagramSymbols... - d pr 10i 0 extproc( + d pr extproc( d 'xmlUCSIsYijingHexagramSymbols') - d code 10i 0 value + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsBlock pr 10i 0 extproc('xmlUCSIsBlock') - d code 10i 0 value + d xmlUCSIsBlock pr extproc('xmlUCSIsBlock') + d like(xmlCint) + d code value like(xmlCint) d block * value options(*string) const char * - d xmlUCSIsCatC pr 10i 0 extproc('xmlUCSIsCatC') - d code 10i 0 value + d xmlUCSIsCatC pr extproc('xmlUCSIsCatC') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatCc pr 10i 0 extproc('xmlUCSIsCatCc') - d code 10i 0 value + d xmlUCSIsCatCc pr extproc('xmlUCSIsCatCc') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatCf pr 10i 0 extproc('xmlUCSIsCatCf') - d code 10i 0 value + d xmlUCSIsCatCf pr extproc('xmlUCSIsCatCf') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatCo pr 10i 0 extproc('xmlUCSIsCatCo') - d code 10i 0 value + d xmlUCSIsCatCo pr extproc('xmlUCSIsCatCo') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatCs pr 10i 0 extproc('xmlUCSIsCatCs') - d code 10i 0 value + d xmlUCSIsCatCs pr extproc('xmlUCSIsCatCs') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatL pr 10i 0 extproc('xmlUCSIsCatL') - d code 10i 0 value + d xmlUCSIsCatL pr extproc('xmlUCSIsCatL') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatLl pr 10i 0 extproc('xmlUCSIsCatLl') - d code 10i 0 value + d xmlUCSIsCatLl pr extproc('xmlUCSIsCatLl') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatLm pr 10i 0 extproc('xmlUCSIsCatLm') - d code 10i 0 value + d xmlUCSIsCatLm pr extproc('xmlUCSIsCatLm') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatLo pr 10i 0 extproc('xmlUCSIsCatLo') - d code 10i 0 value + d xmlUCSIsCatLo pr extproc('xmlUCSIsCatLo') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatLt pr 10i 0 extproc('xmlUCSIsCatLt') - d code 10i 0 value + d xmlUCSIsCatLt pr extproc('xmlUCSIsCatLt') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatLu pr 10i 0 extproc('xmlUCSIsCatLu') - d code 10i 0 value + d xmlUCSIsCatLu pr extproc('xmlUCSIsCatLu') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatM pr 10i 0 extproc('xmlUCSIsCatM') - d code 10i 0 value + d xmlUCSIsCatM pr extproc('xmlUCSIsCatM') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatMc pr 10i 0 extproc('xmlUCSIsCatMc') - d code 10i 0 value + d xmlUCSIsCatMc pr extproc('xmlUCSIsCatMc') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatMe pr 10i 0 extproc('xmlUCSIsCatMe') - d code 10i 0 value + d xmlUCSIsCatMe pr extproc('xmlUCSIsCatMe') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatMn pr 10i 0 extproc('xmlUCSIsCatMn') - d code 10i 0 value + d xmlUCSIsCatMn pr extproc('xmlUCSIsCatMn') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatN pr 10i 0 extproc('xmlUCSIsCatN') - d code 10i 0 value + d xmlUCSIsCatN pr extproc('xmlUCSIsCatN') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatNd pr 10i 0 extproc('xmlUCSIsCatNd') - d code 10i 0 value + d xmlUCSIsCatNd pr extproc('xmlUCSIsCatNd') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatNl pr 10i 0 extproc('xmlUCSIsCatNl') - d code 10i 0 value + d xmlUCSIsCatNl pr extproc('xmlUCSIsCatNl') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatNo pr 10i 0 extproc('xmlUCSIsCatNo') - d code 10i 0 value + d xmlUCSIsCatNo pr extproc('xmlUCSIsCatNo') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatP pr 10i 0 extproc('xmlUCSIsCatP') - d code 10i 0 value + d xmlUCSIsCatP pr extproc('xmlUCSIsCatP') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatPc pr 10i 0 extproc('xmlUCSIsCatPc') - d code 10i 0 value + d xmlUCSIsCatPc pr extproc('xmlUCSIsCatPc') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatPd pr 10i 0 extproc('xmlUCSIsCatPd') - d code 10i 0 value + d xmlUCSIsCatPd pr extproc('xmlUCSIsCatPd') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatPe pr 10i 0 extproc('xmlUCSIsCatPe') - d code 10i 0 value + d xmlUCSIsCatPe pr extproc('xmlUCSIsCatPe') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatPf pr 10i 0 extproc('xmlUCSIsCatPf') - d code 10i 0 value + d xmlUCSIsCatPf pr extproc('xmlUCSIsCatPf') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatPi pr 10i 0 extproc('xmlUCSIsCatPi') - d code 10i 0 value + d xmlUCSIsCatPi pr extproc('xmlUCSIsCatPi') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatPo pr 10i 0 extproc('xmlUCSIsCatPo') - d code 10i 0 value + d xmlUCSIsCatPo pr extproc('xmlUCSIsCatPo') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatPs pr 10i 0 extproc('xmlUCSIsCatPs') - d code 10i 0 value + d xmlUCSIsCatPs pr extproc('xmlUCSIsCatPs') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatS pr 10i 0 extproc('xmlUCSIsCatS') - d code 10i 0 value + d xmlUCSIsCatS pr extproc('xmlUCSIsCatS') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatSc pr 10i 0 extproc('xmlUCSIsCatSc') - d code 10i 0 value + d xmlUCSIsCatSc pr extproc('xmlUCSIsCatSc') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatSk pr 10i 0 extproc('xmlUCSIsCatSk') - d code 10i 0 value + d xmlUCSIsCatSk pr extproc('xmlUCSIsCatSk') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatSm pr 10i 0 extproc('xmlUCSIsCatSm') - d code 10i 0 value + d xmlUCSIsCatSm pr extproc('xmlUCSIsCatSm') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatSo pr 10i 0 extproc('xmlUCSIsCatSo') - d code 10i 0 value + d xmlUCSIsCatSo pr extproc('xmlUCSIsCatSo') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatZ pr 10i 0 extproc('xmlUCSIsCatZ') - d code 10i 0 value + d xmlUCSIsCatZ pr extproc('xmlUCSIsCatZ') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatZl pr 10i 0 extproc('xmlUCSIsCatZl') - d code 10i 0 value + d xmlUCSIsCatZl pr extproc('xmlUCSIsCatZl') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatZp pr 10i 0 extproc('xmlUCSIsCatZp') - d code 10i 0 value + d xmlUCSIsCatZp pr extproc('xmlUCSIsCatZp') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCatZs pr 10i 0 extproc('xmlUCSIsCatZs') - d code 10i 0 value + d xmlUCSIsCatZs pr extproc('xmlUCSIsCatZs') + d like(xmlCint) + d code value like(xmlCint) - d xmlUCSIsCat pr 10i 0 extproc('xmlUCSIsCat') - d code 10i 0 value + d xmlUCSIsCat pr extproc('xmlUCSIsCat') + d like(xmlCint) + d code value like(xmlCint) d cat * value options(*string) const char * /endif LIBXML_UNICODE_ENBLD diff --git a/os400/libxmlrpg/xmlversion.rpgle.in b/os400/libxmlrpg/xmlversion.rpgle.in index 81676bed..955599e2 100644 --- a/os400/libxmlrpg/xmlversion.rpgle.in +++ b/os400/libxmlrpg/xmlversion.rpgle.in @@ -8,6 +8,7 @@ /if not defined(XML_VERSION_H__) /define XML_VERSION_H__ + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/xmlexports" * use those to be sure nothing nasty will happen if @@ -16,7 +17,7 @@ d xmlCheckVersion... d pr extproc('xmlCheckVersion') - d version 10i 0 value + d version value like(xmlCint) * LIBXML_DOTTED_VERSION: * diff --git a/os400/libxmlrpg/xmlwriter.rpgle b/os400/libxmlrpg/xmlwriter.rpgle index f2d3d30e..c8530f8d 100644 --- a/os400/libxmlrpg/xmlwriter.rpgle +++ b/os400/libxmlrpg/xmlwriter.rpgle @@ -12,6 +12,7 @@ /if defined(LIBXML_WRITER_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/xmlstdarg" /include "libxmlrpg/xmlIO" /include "libxmlrpg/list" @@ -31,32 +32,32 @@ d pr extproc('xmlNewTextWriterFilename') d like(xmlTextWriterPtr) d uri * value options(*string) const char * - d compression 10i 0 value + d compression value like(xmlCint) d xmlNewTextWriterMemory... d pr extproc('xmlNewTextWriterMemory') d like(xmlTextWriterPtr) d buf value like(xmlBufferPtr) - d compression 10i 0 value + d compression value like(xmlCint) d xmlNewTextWriterPushParser... d pr extproc('xmlNewTextWriterPushParser') d like(xmlTextWriterPtr) d ctxt value like(xmlParserCtxtPtr) - d compression 10i 0 value + d compression value like(xmlCint) d xmlNewTextWriterDoc... d pr extproc('xmlNewTextWriterDoc') d like(xmlTextWriterPtr) d doc like(xmlDocPtr) - d compression 10i 0 value + d compression value like(xmlCint) d xmlNewTextWriterTree... d pr extproc('xmlNewTextWriterTree') d like(xmlTextWriterPtr) d doc value like(xmlDocPtr) d node value like(xmlNodePtr) - d compression 10i 0 value + d compression value like(xmlCint) d xmlFreeTextWriter... d pr extproc('xmlFreeTextWriter') @@ -67,29 +68,34 @@ * Document d xmlTextWriterStartDocument... - d pr 10i 0 extproc('xmlTextWriterStartDocument') + d pr extproc('xmlTextWriterStartDocument') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d version * value options(*string) const char * d encoding * value options(*string) const char * d standalone * value options(*string) const char * d xmlTextWriterEndDocument... - d pr 10i 0 extproc('xmlTextWriterEndDocument') + d pr extproc('xmlTextWriterEndDocument') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * Comments d xmlTextWriterStartComment... - d pr 10i 0 extproc('xmlTextWriterStartComment') + d pr extproc('xmlTextWriterStartComment') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d xmlTextWriterEndComment... - d pr 10i 0 extproc('xmlTextWriterEndComment') + d pr extproc('xmlTextWriterEndComment') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d xmlTextWriterWriteFormatComment... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatComment') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d format * value options(*string: *nopass) const char * d #vararg1 * value options(*string: *nopass) void * @@ -102,46 +108,53 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatComment... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatComment') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteComment... - d pr 10i 0 extproc('xmlTextWriterWriteComment') + d pr extproc('xmlTextWriterWriteComment') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d content * value options(*string) const xmlChar * * Elements d xmlTextWriterStartElement... - d pr 10i 0 extproc('xmlTextWriterStartElement') + d pr extproc('xmlTextWriterStartElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d xmlTextWriterStartElementNS... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterStartElementNS') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d prefix * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * d namespaceURI * value options(*string) const xmlChar * d xmlTextWriterEndElement... - d pr 10i 0 extproc('xmlTextWriterEndElement') + d pr extproc('xmlTextWriterEndElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d xmlTextWriterFullEndElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterFullEndElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * Elements conveniency functions d xmlTextWriterWriteFormatElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d format * value options(*string) const char * @@ -155,22 +168,25 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteElement... - d pr 10i 0 extproc('xmlTextWriterWriteElement') + d pr extproc('xmlTextWriterWriteElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * d xmlTextWriterWriteFormatElementNS... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatElementNS') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d prefix * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * @@ -186,8 +202,9 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatElementNS... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatElementNS') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d prefix * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * @@ -196,8 +213,9 @@ d argptr likeds(xmlVaList) d xmlTextWriterWriteElementNS... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteElementNS') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d prefix * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * @@ -207,8 +225,9 @@ * Text d xmlTextWriterWriteFormatRaw... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatRaw') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d format * value options(*string) const char * d #vararg1 * value options(*string: *nopass) void * @@ -221,26 +240,30 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatRaw... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatRaw') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteRawLen... - d pr 10i 0 extproc('xmlTextWriterWriteRawLen') + d pr extproc('xmlTextWriterWriteRawLen') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d content * value options(*string) const xmlChar * - d len 10i 0 value + d len value like(xmlCint) d xmlTextWriterWriteRaw... - d pr 10i 0 extproc('xmlTextWriterWriteRaw') + d pr extproc('xmlTextWriterWriteRaw') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d content * value options(*string) const xmlChar * d xmlTextWriterWriteFormatString... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatString') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d format * value options(*string) const char * d #vararg1 * value options(*string: *nopass) void * @@ -253,56 +276,64 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatString... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatString') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteString... - d pr 10i 0 extproc('xmlTextWriterWriteString') + d pr extproc('xmlTextWriterWriteString') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d content * value options(*string) const xmlChar * d xmlTextWriterWriteBase64... - d pr 10i 0 extproc('xmlTextWriterWriteBase64') + d pr extproc('xmlTextWriterWriteBase64') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d data * value options(*string) const char * - d start 10i 0 value - d len 10i 0 value + d start value like(xmlCint) + d len value like(xmlCint) d xmlTextWriterWriteBinHex... - d pr 10i 0 extproc('xmlTextWriterWriteBinHex') + d pr extproc('xmlTextWriterWriteBinHex') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d data * value options(*string) const char * - d start 10i 0 value - d len 10i 0 value + d start value like(xmlCint) + d len value like(xmlCint) * Attributes d xmlTextWriterStartAttribute... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterStartAttribute') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d xmlTextWriterStartAttributeNS... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterStartAttributeNS') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d prefix * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * d namespaceURI * value options(*string) const xmlChar * d xmlTextWriterEndAttribute... - d pr 10i 0 extproc('xmlTextWriterEndAttribute') + d pr extproc('xmlTextWriterEndAttribute') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * Attributes conveniency functions d xmlTextWriterWriteFormatAttribute... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatAttribute') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d format * value options(*string) const char * @@ -316,24 +347,27 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatAttribute... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatAttribute') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteAttribute... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteAttribute') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * d xmlTextWriterWriteFormatAttributeNS... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatAttributeNS' d ) + d like(xmlCint) d writer value like(xmlTextWriterPtr) d prefix * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * @@ -349,8 +383,9 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatAttributeNS... - d pr 10i 0 extproc('xmlTextWriterWriteVFormatAt- + d pr extproc('xmlTextWriterWriteVFormatAt- d tributeNS') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d prefix * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * @@ -359,8 +394,9 @@ d argptr likeds(xmlVaList) d xmlTextWriterWriteAttributeNS... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteAttributeNS') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d prefix * value options(*string) const xmlChar * d name * value options(*string) const xmlChar * @@ -370,18 +406,21 @@ * PI's d xmlTextWriterStartPI... - d pr 10i 0 extproc('xmlTextWriterStartPI') + d pr extproc('xmlTextWriterStartPI') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d target * value options(*string) const xmlChar * d xmlTextWriterEndPI... - d pr 10i 0 extproc('xmlTextWriterEndPI') + d pr extproc('xmlTextWriterEndPI') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * PI conveniency functions d xmlTextWriterWriteFormatPI... - d pr 10i 0 extproc('xmlTextWriterWriteFormatPI') + d pr extproc('xmlTextWriterWriteFormatPI') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d target * value options(*string) const xmlChar * d format * value options(*string) const char * @@ -395,15 +434,17 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatPI... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatPI') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d target * value options(*string) const xmlChar * d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWritePI... - d pr 10i 0 extproc('xmlTextWriterWritePI') + d pr extproc('xmlTextWriterWritePI') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d target * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * @@ -413,7 +454,8 @@ * This macro maps to xmlTextWriterWritePI d xmlTextWriterWriteProcessingInstruction... - d pr 10i 0 extproc('xmlTextWriterWritePI') + d pr extproc('xmlTextWriterWritePI') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d target * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * @@ -421,18 +463,21 @@ * CDATA d xmlTextWriterStartCDATA... - d pr 10i 0 extproc('xmlTextWriterStartCDATA') + d pr extproc('xmlTextWriterStartCDATA') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d xmlTextWriterEndCDATA... - d pr 10i 0 extproc('xmlTextWriterEndCDATA') + d pr extproc('xmlTextWriterEndCDATA') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * CDATA conveniency functions d xmlTextWriterWriteFormatCDATA... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatCDATA') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d format * value options(*string) const char * d #vararg1 * value options(*string: *nopass) void * @@ -445,35 +490,40 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatCDATA... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatCDATA') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteCDATA... - d pr 10i 0 extproc('xmlTextWriterWriteCDATA') + d pr extproc('xmlTextWriterWriteCDATA') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d content * value options(*string) const xmlChar * * DTD d xmlTextWriterStartDTD... - d pr 10i 0 extproc('xmlTextWriterStartDTD') + d pr extproc('xmlTextWriterStartDTD') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d pubid * value options(*string) const xmlChar * d sysid * value options(*string) const xmlChar * d xmlTextWriterEndDTD... - d pr 10i 0 extproc('xmlTextWriterEndDTD') + d pr extproc('xmlTextWriterEndDTD') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * DTD conveniency functions d xmlTextWriterWriteFormatDTD... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatDTD') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d pubid * value options(*string) const xmlChar * @@ -489,8 +539,9 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatDTD... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatDTD') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d pubid * value options(*string) const xmlChar * @@ -499,7 +550,8 @@ d argptr likeds(xmlVaList) d xmlTextWriterWriteDTD... - d pr 10i 0 extproc('xmlTextWriterWriteDTD') + d pr extproc('xmlTextWriterWriteDTD') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d pubid * value options(*string) const xmlChar * @@ -511,7 +563,8 @@ * this macro maps to xmlTextWriterWriteDTD d xmlTextWriterWriteDocType... - d pr 10i 0 extproc('xmlTextWriterWriteDTD') + d pr extproc('xmlTextWriterWriteDTD') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d pubid * value options(*string) const xmlChar * @@ -521,20 +574,23 @@ * DTD element definition d xmlTextWriterStartDTDElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterStartDTDElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d xmlTextWriterEndDTDElement... - d pr 10i 0 extproc('xmlTextWriterEndDTDElement') + d pr extproc('xmlTextWriterEndDTDElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * DTD element definition conveniency functions d xmlTextWriterWriteFormatDTDElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatDTDElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d format * value options(*string) const char * @@ -548,17 +604,19 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatDTDElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatDTDElement' d ) + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteDTDElement... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteDTDElement') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * @@ -566,20 +624,23 @@ * DTD attribute list definition d xmlTextWriterStartDTDAttlist... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterStartDTDAttlist') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d xmlTextWriterEndDTDAttlist... - d pr 10i 0 extproc('xmlTextWriterEndDTDAttlist') + d pr extproc('xmlTextWriterEndDTDAttlist') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * DTD attribute list definition conveniency functions d xmlTextWriterWriteFormatDTDAttlist... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteFormatDTDAttlist') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d format * value options(*string) const char * @@ -593,17 +654,19 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatDTDAttlist... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteVFormatDTDAttlist' d ) + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteDTDAttlist... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteDTDAttlist') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * @@ -611,23 +674,26 @@ * DTD entity definition d xmlTextWriterStartDTDEntity... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterStartDTDEntity') + d like(xmlCint) d writer value like(xmlTextWriterPtr) - d pe 10i 0 value + d pe value like(xmlCint) d name * value options(*string) const xmlChar * d xmlTextWriterEndDTDEntity... - d pr 10i 0 extproc('xmlTextWriterEndDTDEntity') + d pr extproc('xmlTextWriterEndDTDEntity') + d like(xmlCint) d writer value like(xmlTextWriterPtr) * DTD entity definition conveniency functions d xmlTextWriterWriteFormatDTDInternalEntity... - d pr 10i 0 extproc('xmlTextWriterWriteFormatDTD- + d pr extproc('xmlTextWriterWriteFormatDTD- d InternalEntity') + d like(xmlCint) d writer value like(xmlTextWriterPtr) - d pe 10i 0 value + d pe value like(xmlCint) d name * value options(*string) const xmlChar * d format * value options(*string) const char * d #vararg1 * value options(*string: *nopass) void * @@ -640,47 +706,52 @@ d #vararg8 * value options(*string: *nopass) void * d xmlTextWriterWriteVFormatDTDInternalEntity... - d pr 10i 0 extproc('xmlTextWriterWriteVFormatDT- + d pr extproc('xmlTextWriterWriteVFormatDT- d DInternalEntity') + d like(xmlCint) d writer value like(xmlTextWriterPtr) - d pe 10i 0 value + d pe value like(xmlCint) d name * value options(*string) const xmlChar * d format * value options(*string) const char * d argptr likeds(xmlVaList) d xmlTextWriterWriteDTDInternalEntity... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteDTDInternalEntity' d ) + d like(xmlCint) d writer value like(xmlTextWriterPtr) - d pe 10i 0 value + d pe value like(xmlCint) d name * value options(*string) const xmlChar * d content * value options(*string) const xmlChar * d xmlTextWriterWriteDTDExternalEntity... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteDTDExternalEntity' d ) + d like(xmlCint) d writer value like(xmlTextWriterPtr) - d pe 10i 0 value + d pe value like(xmlCint) d name * value options(*string) const xmlChar * d pubid * value options(*string) const xmlChar * d sysid * value options(*string) const xmlChar * d ndataid * value options(*string) const xmlChar * d xmlTextWriterWriteDTDExternalEntityContents... - d pr 10i 0 extproc('xmlTextWriterWriteDTDExtern- + d pr extproc('xmlTextWriterWriteDTDExtern- d alEntityContents') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d pubid * value options(*string) const xmlChar * d sysid * value options(*string) const xmlChar * d ndataid * value options(*string) const xmlChar * d xmlTextWriterWriteDTDEntity... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteDTDEntity') + d like(xmlCint) d writer value like(xmlTextWriterPtr) - d pe 10i 0 value + d pe value like(xmlCint) d name * value options(*string) const xmlChar * d pubid * value options(*string) const xmlChar * d sysid * value options(*string) const xmlChar * @@ -690,8 +761,9 @@ * DTD notation definition d xmlTextWriterWriteDTDNotation... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterWriteDTDNotation') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d name * value options(*string) const xmlChar * d pubid * value options(*string) const xmlChar * @@ -700,25 +772,29 @@ * Indentation d xmlTextWriterSetIndent... - d pr 10i 0 extproc('xmlTextWriterSetIndent') + d pr extproc('xmlTextWriterSetIndent') + d like(xmlCint) d writer value like(xmlTextWriterPtr) - d indent 10i 0 value + d indent value like(xmlCint) d xmlTextWriterSetIndentString... - d pr 10i 0 extproc( + d pr extproc( d 'xmlTextWriterSetIndentString') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d str * value options(*string) const xmlChar * d xmlTextWriterSetQuoteChar... - d pr 10i 0 extproc('xmlTextWriterSetQuoteChar') + d pr extproc('xmlTextWriterSetQuoteChar') + d like(xmlCint) d writer value like(xmlTextWriterPtr) d quotechar value like(xmlChar) * misc d xmlTextWriterFlush... - d pr 10i 0 extproc('xmlTextWriterFlush') + d pr extproc('xmlTextWriterFlush') + d like(xmlCint) d writer value like(xmlTextWriterPtr) /endif LIBXML_WRITER_ENABLD diff --git a/os400/libxmlrpg/xpath.rpgle b/os400/libxmlrpg/xpath.rpgle index 1784fada..6e591ee4 100644 --- a/os400/libxmlrpg/xpath.rpgle +++ b/os400/libxmlrpg/xpath.rpgle @@ -18,10 +18,10 @@ /define XML_XPATH_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/xmlTypesC" /if defined(LIBXML_XPATH_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/xmlerror" /include "libxmlrpg/tree" /include "libxmlrpg/hash" @@ -37,7 +37,8 @@ * The set of XPath error codes. - d xmlXPathError s 10i 0 based(######typedef######) enum + d xmlXPathError s based(######typedef######) + d like(xmlCenum) d XPATH_EXPRESSION_OK... d c 0 d XPATH_NUMBER_ERROR... @@ -95,8 +96,8 @@ d xmlNodeSet ds based(xmlNodeSetPtr) d align qualified - d nodeNr 10i 0 Set node count - d nodeMax 10i 0 Max # nodes in set + d nodeNr like(xmlCint) Set node count + d nodeMax like(xmlCint) Max # nodes in set d nodeTab * xmlNodePtr * * An expression is evaluated to yield an object, which @@ -109,7 +110,8 @@ * @@ XPointer will add more types ! d xmlXPathObjectType... - d s 10i 0 based(######typedef######) enum + d s based(######typedef######) + d like(xmlCenum) d XPATH_UNDEFINED... d c 0 d XPATH_NODESET c 1 @@ -131,13 +133,13 @@ d align qualified d type like(xmlXPathObjectType) d nodesetval like(xmlNodeSetPtr) - d boolval 10i 0 - d floatval 8f + d boolval like(xmlCint) + d floatval like(xmlCdouble) d stringval * xmlChar * d user * void * - d index 10i 0 + d index like(xmlCint) d user2 * void * - d index2 10i 0 + d index2 like(xmlCint) * xmlXPathConvertFunc: * @obj: an XPath object @@ -299,69 +301,69 @@ d node like(xmlNodePtr) Current node * d nb_variables_unused... Unused (hash table) - d 10i 0 - d max_variables_unused... Unused (hash table) - d 10i 0 - d varHash like(xmlHashTablePtr) Defined variables + d like(xmlCint) + d max_variables_unused... Unused (hash table) + d like(xmlCint) + d varHash like(xmlHashTablePtr) Defined variables * - d nb_types 10i 0 # of defined types - d max_types 10i 0 Max number of types - d types like(xmlXPathTypePtr) Defined types array + d nb_types like(xmlCint) # of defined types + d max_types like(xmlCint) Max number of types + d types like(xmlXPathTypePtr) Defined types array * d nb_funcs_unused... Unused (hash table) - d 10i 0 - d max_funcs_unused... Unused (hash table) - d 10i 0 - d funcHash like(xmlHashTablePtr) Defined functions + d like(xmlCint) + d max_funcs_unused... Unused (hash table) + d like(xmlCint) + d funcHash like(xmlHashTablePtr) Defined functions * - d nb_axis 10i 0 # of defined axis - d max_axis 10i 0 Max number of axis - d axis like(xmlXPathAxisPtr) Defined axis array + d nb_axis like(xmlCint) # of defined axis + d max_axis like(xmlCint) Max number of axis + d axis like(xmlXPathAxisPtr) Defined axis array * * the namespace nodes of the context node * - d namespaces * xmlNsPtr * - d nsNr 10i 0 # scope namespaces - d user * procptr Function to free + d namespaces * xmlNsPtr * + d nsNr like(xmlCint) # scope namespaces + d user * procptr Function to free * * extra variables * - d contextSize 10i 0 The context size + d contextSize like(xmlCint) The context size d proximityPosition... - d 10i 0 + d like(xmlCint) * * extra stuff for XPointer * - d xptr 10i 0 XPointer context ? - d here like(xmlNodePtr) For here() - d origin like(xmlNodePtr) For origin() + d xptr like(xmlCint) XPointer context ? + d here like(xmlNodePtr) For here() + d origin like(xmlNodePtr) For origin() * * the set of namespace declarations in scope for the expression * - d nsHash like(xmlHashTablePtr) Namespace hashtable - d varLookupFunc like(xmlXPathVariableLookupFunc) Var lookup function - d varLookupData * void * + d nsHash like(xmlHashTablePtr) Namespace hashtable + d varLookupFunc like(xmlXPathVariableLookupFunc) Var lookup function + d varLookupData * void * * * Possibility to link in an extra item * - d extra * void * + d extra * void * * * The function name and URI when calling a function * - d function * const xmlChar * - d functionURI * const xmlChar * + d function * const xmlChar * + d functionURI * const xmlChar * * * function lookup function and data * - d funcLookupFunc... Func lookup func + d funcLookupFunc... Func lookup func d like(xmlXPathVariableLookupFunc) - d funcLookupData... void * + d funcLookupData... void * d * * * temporary namespace lists kept for walking the namespace axis * d tmpNsList * xmlNsPtr * - d tmpNsNr 10i 0 # scope namespaces + d tmpNsNr like(xmlCint) # scope namespaces * * error reporting mechanism * @@ -374,7 +376,7 @@ * d dict like(xmlDictPtr) Dictionary if any * - d flags 10i 0 Compilation control + d flags like(xmlCint) Compilation control * * Cache for reusal of XPath objects * @@ -396,19 +398,19 @@ d cur * const xmlChar * d base * const xmlChar * * - d error 10i 0 Error code + d error like(xmlCint) Error code * d context like(xmlXPathContextPtr) Evaluation context d value like(xmlXPathObjectPtr) The current value - d valueNr 10i 0 Value stack depth - d valueMax 10i 0 Max stack depth + d valueNr like(xmlCint) Value stack depth + d valueMax like(xmlCint) Max stack depth d valueTab * xmlXPathObjectPtr * * d comp like(xmlXPathCompExprPtr) Precompiled expr. - d xptr 10i 0 XPointer expression? + d xptr like(xmlCint) XPointer expression? d ancestor like(xmlNodePtr) To walk prec. axis * - d valueFrame 10i 0 Limit stack pop + d valueFrame like(xmlCint) Limit stack pop ************************************************************************** * * @@ -418,9 +420,14 @@ * Objects and Nodesets handling - d xmlXPathNAN s 8f import('xmlXPathNAN') - d xmlXPathPINF s 8f import('xmlXPathPINF') - d xmlXPathNINF s 8f import('xmlXPathNINF') + d xmlXPathNAN s import('xmlXPathNAN') + d like(xmlCdouble) + + d xmlXPathPINF s import('xmlXPathPINF') + d like(xmlCdouble) + + d xmlXPathNINF s import('xmlXPathNINF') + d like(xmlCdouble) d xmlXPathFreeObject... d pr extproc('xmlXPathFreeObject') @@ -445,62 +452,71 @@ d val value like(xmlXPathObjectPtr) d xmlXPathCmpNodes... - d pr 10i 0 extproc('xmlXPathCmpNodes') + d pr extproc('xmlXPathCmpNodes') + d like(xmlCint) d node1 value like(xmlNodePtr) d node2 value like(xmlNodePtr) * Conversion functions to basic types. d xmlXPathCastNumberToBoolean... - d pr 10i 0 extproc( + d pr extproc( d 'xmlXPathCastNumberToBoolean') - d val 8f value + d like(xmlCint) + d val value like(xmlCdouble) d xmlXPathCastStringToBoolean... - d pr 10i 0 extproc( + d pr extproc( d 'xmlXPathCastStringToBoolean') + d like(xmlCint) d val * value options(*string) const xmlChar * d xmlXPathCastNodeSetToBoolean... - d pr 10i 0 extproc( + d pr extproc( d 'xmlXPathCastNodeSetToBoolean') + d like(xmlCint) d ns value like(xmlNodeSetPtr) d xmlXPathCastToBoolean... - d pr 10i 0 extproc('xmlXPathCastToBoolean') + d pr extproc('xmlXPathCastToBoolean') + d like(xmlCint) d val value like(xmlXPathObjectPtr) d xmlXPathCastBooleanToNumber... d pr extproc( d 'xmlXPathCastBooleanToNumber') - d 8f - d val 10i 0 value + d like(xmlCdouble) + d val value like(xmlCint) d xmlXPathCastStringToNumber... - d pr 8f extproc('xmlXPathCastStringToNumber') + d pr extproc('xmlXPathCastStringToNumber') + d like(xmlCdouble) d val * value options(*string) const xmlChar * d xmlXPathCastNodeToNumber... - d pr 8f extproc('xmlXPathCastNodeToNumber') + d pr extproc('xmlXPathCastNodeToNumber') + d like(xmlCdouble) d node value like(xmlNodePtr) d xmlXPathCastNodeSetToNumber... - d pr 8f extproc( + d pr extproc( d 'xmlXPathCastNodeSetToNumber') + d like(xmlCdouble) d ns value like(xmlNodeSetPtr) d xmlXPathCastToNumber... - d pr 8f extproc('xmlXPathCastToNumber') + d pr extproc('xmlXPathCastToNumber') + d like(xmlCdouble) d val value like(xmlXPathObjectPtr) d xmlXPathCastBooleanToString... d pr * extproc( xmlChar * d 'xmlXPathCastBooleanToString') - d val 10i 0 value + d val value like(xmlCint) d xmlXPathCastNumberToString... d pr * extproc('xmlXPathCastNumberToString')xmlChar * - d val 8f value + d val value like(xmlCdouble) d xmlXPathCastNodeToString... d pr * extproc('xmlXPathCastNodeToString') xmlChar * @@ -542,11 +558,12 @@ d ctxt value like(xmlXPathContextPtr) d xmlXPathContextSetCache... - d pr 10i 0 extproc('xmlXPathContextSetCache') + d pr extproc('xmlXPathContextSetCache') + d like(xmlCint) d ctxt value like(xmlXPathContextPtr) - d active 10i 0 value - d value 10i 0 value - d options 10i 0 value + d active value like(xmlCint) + d value value like(xmlCint) + d options value like(xmlCint) * Evaluation functions. @@ -556,7 +573,8 @@ d doc value like(xmlDocPtr) d xmlXPathSetContextNode... - d pr 10i 0 extproc('xmlXPathSetContextNode') + d pr extproc('xmlXPathSetContextNode') + d like(xmlCint) d node value like(xmlNodePtr) d ctx value like(xmlXPathContextPtr) @@ -579,7 +597,8 @@ d ctxt value like(xmlXPathContextPtr) d xmlXPathEvalPredicate... - d pr 10i 0 extproc('xmlXPathEvalPredicate') + d pr extproc('xmlXPathEvalPredicate') + d like(xmlCint) d ctxt value like(xmlXPathContextPtr) d res value like(xmlXPathObjectPtr) @@ -603,8 +622,9 @@ d ctx value like(xmlXPathContextPtr) d xmlXPathCompiledEvalToBoolean... - d pr 10i 0 extproc( + d pr extproc( d 'xmlXPathCompiledEvalToBoolean') + d like(xmlCint) d comp value like(xmlXPathCompExprPtr) d ctxt value like(xmlXPathContextPtr) @@ -622,11 +642,13 @@ /if defined(XML_TESTVAL) d xmlXPathInit pr extproc('xmlXPathInit') - d xmlXPathIsNaN pr 10i 0 extproc('xmlXPathIsNaN') - d val 8f value + d xmlXPathIsNaN pr extproc('xmlXPathIsNaN') + d like(xmlCint) + d val value like(xmlCdouble) - d xmlXPathIsInf pr 10i 0 extproc('xmlXPathIsInf') - d val 8f value + d xmlXPathIsInf pr extproc('xmlXPathIsInf') + d like(xmlCint) + d val value like(xmlCdouble) /undefine XML_TESTVAL /endif @@ -635,17 +657,19 @@ /if defined(LIBXML_XPATH_ENABLED) d xmlXPathNodeSetGetLength... - d pr 10i 0 extproc('__xmlXPathNodeSetGetLength') + d pr extproc('__xmlXPathNodeSetGetLength') + d like(xmlCint) d ns value like(xmlNodeSetPtr) d xmlXPathNodeSetItem... d pr extproc('__xmlXPathNodeSetItem') d like(xmlNodePtr) d ns value like(xmlNodeSetPtr) - d index 10i 0 value + d index value like(xmlCint) d xmlXPathNodeSetIsEmpty... - d pr 10i 0 extproc('__xmlXPathNodeSetIsEmpty') + d pr extproc('__xmlXPathNodeSetIsEmpty') + d like(xmlCint) d ns value like(xmlNodeSetPtr) /endif LIBXML_XPATH_ENABLED /endif XML_XPATH_H__ diff --git a/os400/libxmlrpg/xpathInternals.rpgle b/os400/libxmlrpg/xpathInternals.rpgle index 69f3ae0e..a6d12e15 100644 --- a/os400/libxmlrpg/xpathInternals.rpgle +++ b/os400/libxmlrpg/xpathInternals.rpgle @@ -11,10 +11,12 @@ /define XML_XPATH_INTERNALS_H__ /include "libxmlrpg/xmlversion" - /include "libxmlrpg/xpath" /if defined(LIBXML_XPATH_ENABLED) + /include "libxmlrpg/xmlTypesC" + /include "libxmlrpg/xpath" + ************************************************************************ * * * Helpers * @@ -25,11 +27,13 @@ * shouldn't be used in #ifdef's preprocessor instructions. d xmlXPathPopBoolean... - d pr 10i 0 extproc('xmlXPathPopBoolean') + d pr extproc('xmlXPathPopBoolean') + d like(xmlCint) d ctxt value like(xmlXPathParserContextPtr) d xmlXPathPopNumber... - d pr 8f extproc('xmlXPathPopNumber') + d pr extproc('xmlXPathPopNumber') + d like(xmlCdouble) d ctxt value like(xmlXPathParserContextPtr) d xmlXPathPopString... @@ -71,31 +75,32 @@ d pr extproc('xmlXPatherror') d ctxt value like(xmlXPathParserContextPtr) d file * value options(*string) const char * - d line 10i 0 value - d no 10i 0 value + d line value like(xmlCint) + d no value like(xmlCint) d xmlXPathErr pr extproc('xmlXPathErr') d ctxt value like(xmlXPathParserContextPtr) - d error 10i 0 value + d error value like(xmlCint) /if defined(LIBXML_DEBUG_ENABLED) d xmlXPathDebugDumpObject... d pr extproc('xmlXPathDebugDumpObject') d output * value FILE * d cur value like(xmlXPathObjectPtr) - d depth 10i 0 value + d depth value like(xmlCint) d xmlXPathDebugDumpCompExpr... d pr extproc('xmlXPathDebugDumpCompExpr') d output * value FILE * d comp value like(xmlXPathCompExprPtr) - d depth 10i 0 value + d depth value like(xmlCint) /endif * NodeSet handling. d xmlXPathNodeSetContains... - d pr 10i 0 extproc('xmlXPathNodeSetContains') + d pr extproc('xmlXPathNodeSetContains') + d like(xmlCint) d cur value like(xmlNodeSetPtr) d val value like(xmlNodePtr) @@ -122,7 +127,8 @@ d nodes value like(xmlNodeSetPtr) d xmlXPathHasSameNodes... - d pr 10i 0 extproc('xmlXPathHasSameNodes') + d pr extproc('xmlXPathHasSameNodes') + d like(xmlCint) d nodes1 value like(xmlNodeSetPtr) d nodes2 value like(xmlNodeSetPtr) @@ -177,7 +183,8 @@ * Extending a context. d xmlXPathRegisterNs... - d pr 10i 0 extproc('xmlXPathRegisterNs') + d pr extproc('xmlXPathRegisterNs') + d like(xmlCint) d ctxt value like(xmlXPathContextPtr) d prefix * value options(*string) const xmlChar * d ns_uri * value options(*string) const xmlChar * @@ -193,26 +200,30 @@ d ctxt value like(xmlXPathContextPtr) d xmlXPathRegisterFunc... - d pr 10i 0 extproc('xmlXPathRegisterFunc') + d pr extproc('xmlXPathRegisterFunc') + d like(xmlCint) d ctxt value like(xmlXPathContextPtr) d name * value options(*string) const xmlChar * d f value like(xmlXPathFunction) d xmlXPathRegisterFuncNS... - d pr 10i 0 extproc('xmlXPathRegisterFuncNS') + d pr extproc('xmlXPathRegisterFuncNS') + d like(xmlCint) d ctxt value like(xmlXPathContextPtr) d name * value options(*string) const xmlChar * d ns_uri * value options(*string) const xmlChar * d f value like(xmlXPathFunction) d xmlXPathRegisterVariable... - d pr 10i 0 extproc('xmlXPathRegisterVariable') + d pr extproc('xmlXPathRegisterVariable') + d like(xmlCint) d ctxt value like(xmlXPathContextPtr) d name * value options(*string) const xmlChar * d value value like(xmlXPathObjectPtr) d xmlXPathRegisterVariableNS... - d pr 10i 0 extproc('xmlXPathRegisterVariableNS') + d pr extproc('xmlXPathRegisterVariableNS') + d like(xmlCint) d ctxt value like(xmlXPathContextPtr) d name * value options(*string) const xmlChar * d ns_uri * value options(*string) const xmlChar * @@ -273,7 +284,8 @@ d like(xmlXPathObjectPtr) d ctxt value like(xmlXPathParserContextPtr) - d valuePush pr 10i 0 extproc('valuePush') + d valuePush pr extproc('valuePush') + d like(xmlCint) d ctxt value like(xmlXPathParserContextPtr) d value value like(xmlXPathObjectPtr) @@ -300,12 +312,12 @@ d xmlXPathNewFloat... d pr extproc('xmlXPathNewFloat') d like(xmlXPathObjectPtr) - d val 8f value + d val value like(xmlCdouble) d xmlXPathNewBoolean... d pr extproc('xmlXPathNewBoolean') d like(xmlXPathObjectPtr) - d val 10i 0 value + d val value like(xmlCint) d xmlXPathNewNodeSet... d pr extproc('xmlXPathNewNodeSet') @@ -318,17 +330,20 @@ d val value like(xmlNodePtr) d xmlXPathNodeSetAdd... - d pr 10i 0 extproc('xmlXPathNodeSetAdd') + d pr extproc('xmlXPathNodeSetAdd') + d like(xmlCint) d cur value like(xmlNodeSetPtr) d val value like(xmlNodePtr) d xmlXPathNodeSetAddUnique... - d pr 10i 0 extproc('xmlXPathNodeSetAddUnique') + d pr extproc('xmlXPathNodeSetAddUnique') + d like(xmlCint) d cur value like(xmlNodeSetPtr) d val value like(xmlNodePtr) d xmlXPathNodeSetAddNs... - d pr 10i 0 extproc('xmlXPathNodeSetAddNs') + d pr extproc('xmlXPathNodeSetAddNs') + d like(xmlCint) d cur value like(xmlNodeSetPtr) d node value like(xmlNodePtr) d ns value like(xmlNsPtr) @@ -355,12 +370,14 @@ * Existing functions. d xmlXPathStringEvalNumber... - d pr 8f extproc('xmlXPathStringEvalNumber') + d pr extproc('xmlXPathStringEvalNumber') + d like(xmlCdouble) d str * value options(*string) const xmlChar * d xmlXPathEvaluatePredicateResult... - d pr 10i 0 extproc( + d pr extproc( d 'xmlXPathEvaluatePredicateResult') + d like(xmlCint) d ctxt value like(xmlXPathParserContextPtr) d res value like(xmlXPathObjectPtr) @@ -383,7 +400,7 @@ d xmlXPathNodeSetRemove... d pr extproc('xmlXPathNodeSetRemove') d cur value like(xmlNodeSetPtr) - d val 10i 0 value + d val value like(xmlCint) d xmlXPathNewNodeSetList... d pr extproc('xmlXPathNewNodeSetList') @@ -401,18 +418,21 @@ d val * value void * d xmlXPathEqualValues... - d pr 10i 0 extproc('xmlXPathEqualValues') + d pr extproc('xmlXPathEqualValues') + d like(xmlCint) d ctxt value like(xmlXPathParserContextPtr) d xmlXPathNotEqualValues... - d pr 10i 0 extproc('xmlXPathNotEqualValues') + d pr extproc('xmlXPathNotEqualValues') + d like(xmlCint) d ctxt value like(xmlXPathParserContextPtr) d xmlXPathCompareValues... - d pr 10i 0 extproc('xmlXPathCompareValues') + d pr extproc('xmlXPathCompareValues') + d like(xmlCint) d ctxt value like(xmlXPathParserContextPtr) - d inf 10i 0 value - d strict 10i 0 value + d inf value like(xmlCint) + d strict value like(xmlCint) d xmlXPathValueFlipSign... d pr extproc('xmlXPathValueFlipSign') @@ -439,7 +459,8 @@ d ctxt value like(xmlXPathParserContextPtr) d xmlXPathIsNodeType... - d pr 10i 0 extproc('xmlXPathIsNodeType') + d pr extproc('xmlXPathIsNodeType') + d like(xmlCint) d name * value options(*string) const xmlChar * * Some of the axis navigation routines. @@ -530,137 +551,137 @@ d xmlXPathLastFunction... d pr extproc('xmlXPathLastFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathPositionFunction... d pr extproc('xmlXPathPositionFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathCountFunction... d pr extproc('xmlXPathCountFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathIdFunction... d pr extproc('xmlXPathIdFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathLocalNameFunction... d pr extproc('xmlXPathLocalNameFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathNamespaceURIFunction... d pr extproc( d 'xmlXPathNamespaceURIFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathStringFunction... d pr extproc('xmlXPathStringFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathStringLengthFunction... d pr extproc( d 'xmlXPathStringLengthFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathConcatFunction... d pr extproc('xmlXPathConcatFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathContainsFunction... d pr extproc('xmlXPathContainsFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathStartsWithFunction... d pr extproc('xmlXPathStartsWithFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathSubstringFunction... d pr extproc('xmlXPathSubstringFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathSubstringBeforeFunction... d pr extproc( d 'xmlXPathSubstringBeforeFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathSubstringAfterFunction... d pr extproc( d 'xmlXPathSubstringAfterFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathNormalizeFunction... d pr extproc('xmlXPathNormalizeFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathTranslateFunction... d pr extproc('xmlXPathTranslateFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathNotFunction... d pr extproc('xmlXPathNotFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathTrueFunction... d pr extproc('xmlXPathTrueFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathFalseFunction... d pr extproc('xmlXPathFalseFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathLangFunction... d pr extproc('xmlXPathLangFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathNumberFunction... d pr extproc('xmlXPathNumberFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathSumFunction... d pr extproc('xmlXPathSumFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathFloorFunction... d pr extproc('xmlXPathFloorFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathCeilingFunction... d pr extproc('xmlXPathCeilingFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathRoundFunction... d pr extproc('xmlXPathRoundFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPathBooleanFunction... d pr extproc('xmlXPathBooleanFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) * Really internal functions diff --git a/os400/libxmlrpg/xpointer.rpgle b/os400/libxmlrpg/xpointer.rpgle index 6f433147..29ef0f38 100644 --- a/os400/libxmlrpg/xpointer.rpgle +++ b/os400/libxmlrpg/xpointer.rpgle @@ -19,6 +19,7 @@ /if defined(LIBXML_XPTR_ENABLED) + /include "libxmlrpg/xmlTypesC" /include "libxmlrpg/tree" /include "libxmlrpg/xpath" @@ -29,8 +30,8 @@ d xmlLocationSet ds based(xmlLocationSetPtr) d align qualified - d locNr 10i 0 # locations in set - d locMax 10i 0 Max locations in set + d locNr like(xmlCint) # locations in set + d locMax like(xmlCint) Max locations in set d locTab * xmlXPathObjectPtr * * Handling of location sets. @@ -54,9 +55,9 @@ d pr extproc('xmlXPtrNewRange') d like(xmlXPathObjectPtr) d start value like(xmlNodePtr) - d startindex 10i 0 value + d startindex value like(xmlCint) d end value like(xmlNodePtr) - d endindex 10i 0 value + d endindex value like(xmlCint) d xmlXPtrNewRangePoints... d pr extproc('xmlXPtrNewRangePoints') @@ -123,7 +124,7 @@ d xmlXPtrLocationSetRemove... d pr extproc('xmlXPtrLocationSetRemove') d cur value like(xmlLocationSetPtr) - d val 10i 0 value + d val value like(xmlCint) * Functions. @@ -142,7 +143,7 @@ d xmlXPtrRangeToFunction... d pr extproc('xmlXPtrRangeToFunction') d ctxt value like(xmlXPathParserContextPtr) - d nargs 10i 0 value + d nargs value like(xmlCint) d xmlXPtrBuildNodeList... d pr extproc('xmlXPtrBuildNodeList') diff --git a/os400/make-src.sh b/os400/make-src.sh index f06cfafe..6094de8e 100644 --- a/os400/make-src.sh +++ b/os400/make-src.sh @@ -17,7 +17,7 @@ cd "${TOPDIR}" echo '#pragma comment(user, "libxml2 version '"${LIBXML_VERSION}"'")' > os400.c echo '#pragma comment(user, __DATE__)' >> os400.c echo '#pragma comment(user, __TIME__)' >> os400.c -echo '#pragma comment(copyright, "Copyright (C) 1998-2014 Daniel Veillard. OS/400 version by P. Monnerat.")' >> os400.c +echo '#pragma comment(copyright, "Copyright (C) 1998-2015 Daniel Veillard. OS/400 version by P. Monnerat.")' >> os400.c make_module OS400 os400.c LINK= # No need to rebuild service program yet. MODULES= @@ -62,11 +62,11 @@ INCLUDES="'`pwd`'" # OS/400 specific modules first. -make_module DLFCN "${SCRIPTDIR}/dlfcn/dlfcn.c" '' ebcdic -make_module ICONV "${SCRIPTDIR}/iconv/iconv.c" '' ebcdic -make_module WRAPPERS "${SCRIPTDIR}/wrappers.c" '' ebcdic -make_module TRANSCODE "${SCRIPTDIR}/transcode.c" -make_module RPGSUPPORT "${SCRIPTDIR}/rpgsupport.c" +make_module --ebcdic DLFCN "${SCRIPTDIR}/dlfcn/dlfcn.c" +make_module --ebcdic ICONV "${SCRIPTDIR}/iconv/iconv.c" +make_module --ebcdic WRAPPERS "${SCRIPTDIR}/wrappers.c" +make_module TRANSCODE "${SCRIPTDIR}/transcode.c" +make_module RPGSUPPORT "${SCRIPTDIR}/rpgsupport.c" # Regular libxml2 modules. @@ -239,3 +239,117 @@ then rm -rf "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR" CMD="${CMD} OBJ((*LIBL/${SRVPGM} *SRVPGM))" system "${CMD}" fi + + +# Compile the ASCII main() stub. + +make_module --ebcdic --sysiconv LIBXMLMAIN "${SCRIPTDIR}/libxmlmain.c" + + +# Compile and link program xmllint. + +if action_needed "${LIBIFSNAME}/XMLLINT.PGM" "xmllint.c" || + action_needed "${LIBIFSNAME}/XMLLINT.PGM" "${LIBIFSNAME}/${SRVPGM}.SRVPGM" || + action_needed "${LIBIFSNAME}/XMLLINT.PGM" "${LIBIFSNAME}/LIBXMLMAIN.MODULE" +then make_module XMLLINT xmllint.c + CMD="CRTPGM PGM(${TARGETLIB}/XMLLINT) MODULE(${TARGETLIB}/XMLLINT)" + CMD="${CMD} ENTMOD(${TARGETLIB}/LIBXMLMAIN)" + CMD="${CMD} BNDSRVPGM(QADRTTS) BNDDIR((${TARGETLIB}/${STATBNDDIR})" + if [ "${WITH_ZLIB}" -ne 0 ] + then CMD="${CMD} (${ZLIB_LIB}/${ZLIB_BNDDIR})" + fi + CMD="${CMD}) ACTGRP(*NEW) TEXT('XML tool')" + CMD="${CMD} TGTRLS(${TGTRLS})" + system "${CMD}" + rm -f "${LIBIFSNAME}/XMLLINT.MODULE" +fi + +# Install xmllint in IFS. + +if [ ! -d "${IFSDIR}/bin" ] +then mkdir -p "${IFSDIR}/bin" +fi +rm -f "${IFSDIR}/bin/xmllint" +ln -s "${LIBIFSNAME}/XMLLINT.PGM" "${IFSDIR}/bin/xmllint" + +# Prepare the XMLLINT command and its response program. + +if action_needed "${LIBIFSNAME}/XMLLINTCL.PGM" "${SCRIPTDIR}/xmllintcl.c" +then make_module --ebcdic XMLLINTCL "${SCRIPTDIR}/xmllintcl.c" + CMD="CRTPGM PGM(${TARGETLIB}/XMLLINTCL) MODULE(${TARGETLIB}/XMLLINTCL)" + CMD="${CMD} ACTGRP(*NEW) TEXT('XMLLINT command response')" + CMD="${CMD} TGTRLS(${TGTRLS})" + system "${CMD}" + rm -f "${LIBIFSNAME}/XMLLINTCL.MODULE" +fi + +if action_needed "${LIBIFSNAME}/TOOLS.FILE/XMLLINT.MBR" \ + "${SCRIPTDIR}/xmllint.cmd" +then CMD="CPY OBJ('${SCRIPTDIR}/xmllint.cmd')" + CMD="${CMD} TOOBJ('${LIBIFSNAME}/TOOLS.FILE/XMLLINT.MBR')" + CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)" + system "${CMD}" +fi + +if action_needed "${LIBIFSNAME}/XMLLINT.CMD" \ + "${LIBIFSNAME}/TOOLS.FILE/XMLLINT.MBR" +then CMD="CRTCMD CMD(${TARGETLIB}/XMLLINT) PGM(${TARGETLIB}/XMLLINTCL)" + CMD="${CMD} SRCFILE(${TARGETLIB}/TOOLS) SRCMBR(XMLLINT) THDSAFE(*YES)" + CMD="${CMD} TEXT('XML tool') REPLACE(*YES)" + system "${CMD}" +fi + + +# Compile and link program xmlcatalog. + +if action_needed "${LIBIFSNAME}/XMLCATALOG.PGM" "xmlcatalog.c" || + action_needed "${LIBIFSNAME}/XMLCATALOG.PGM" \ + "${LIBIFSNAME}/${SRVPGM}.SRVPGM" || + action_needed "${LIBIFSNAME}/XMLCATALOG.PGM" \ + "${LIBIFSNAME}/LIBXMLMAIN.MODULE" +then make_module XMLCATALOG xmlcatalog.c + CMD="CRTPGM PGM(${TARGETLIB}/XMLCATALOG)" + CMD="${CMD} MODULE(${TARGETLIB}/XMLCATALOG)" + CMD="${CMD} ENTMOD(${TARGETLIB}/LIBXMLMAIN)" + CMD="${CMD} BNDSRVPGM(QADRTTS) BNDDIR((${TARGETLIB}/${STATBNDDIR})" + if [ "${WITH_ZLIB}" -ne 0 ] + then CMD="${CMD} (${ZLIB_LIB}/${ZLIB_BNDDIR})" + fi + CMD="${CMD}) ACTGRP(*NEW) TEXT('XML/SGML catalog tool')" + CMD="${CMD} TGTRLS(${TGTRLS})" + system "${CMD}" + rm -f "${LIBIFSNAME}/XMLCATALOG.MODULE" +fi + +# Install xmlcatalog in IFS. + +rm -f "${IFSDIR}/bin/xmlcatalog" +ln -s "${LIBIFSNAME}/XMLCATALOG.PGM" "${IFSDIR}/bin/xmlcatalog" + +# Prepare the XMLCATALOG command and its response program. + +if action_needed "${LIBIFSNAME}/XMLCATLGCL.PGM" "${SCRIPTDIR}/xmlcatlgcl.c" +then make_module --ebcdic XMLCATLGCL "${SCRIPTDIR}/xmlcatlgcl.c" + CMD="CRTPGM PGM(${TARGETLIB}/XMLCATLGCL)" + CMD="${CMD} MODULE(${TARGETLIB}/XMLCATLGCL)" + CMD="${CMD} ACTGRP(*NEW) TEXT('XMLCATALOG command response')" + CMD="${CMD} TGTRLS(${TGTRLS})" + system "${CMD}" + rm -f "${LIBIFSNAME}/XMLCATLGCL.MODULE" +fi + +if action_needed "${LIBIFSNAME}/TOOLS.FILE/XMLCATALOG.MBR" \ + "${SCRIPTDIR}/xmlcatalog.cmd" +then CMD="CPY OBJ('${SCRIPTDIR}/xmlcatalog.cmd')" + CMD="${CMD} TOOBJ('${LIBIFSNAME}/TOOLS.FILE/XMLCATALOG.MBR')" + CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)" + system "${CMD}" +fi + +if action_needed "${LIBIFSNAME}/XMLCATALOG.CMD" \ + "${LIBIFSNAME}/TOOLS.FILE/XMLCATALOG.MBR" +then CMD="CRTCMD CMD(${TARGETLIB}/XMLCATALOG) PGM(${TARGETLIB}/XMLCATLGCL)" + CMD="${CMD} SRCFILE(${TARGETLIB}/TOOLS) SRCMBR(XMLCATALOG)" + CMD="${CMD} THDSAFE(*YES) TEXT('XML/SGML catalog tool') REPLACE(*YES)" + system "${CMD}" +fi diff --git a/os400/rpgsupport.c b/os400/rpgsupport.c index a3609c02..ad4cc5dd 100644 --- a/os400/rpgsupport.c +++ b/os400/rpgsupport.c @@ -219,7 +219,7 @@ int __xmlXPathNodeSetGetLength(const xmlNodeSet * ns) { - return xmlXPathNodeSetGetLength(ns); + return xmlXPathNodeSetGetLength(ns); } @@ -227,7 +227,7 @@ xmlNodePtr __xmlXPathNodeSetItem(const xmlNodeSet * ns, int index) { - return xmlXPathNodeSetItem(ns, index); + return xmlXPathNodeSetItem(ns, index); } @@ -235,7 +235,7 @@ int __xmlXPathNodeSetIsEmpty(const xmlNodeSet * ns) { - return xmlXPathNodeSetIsEmpty(ns); + return xmlXPathNodeSetIsEmpty(ns); } #endif @@ -247,16 +247,16 @@ const char * __htmlDefaultSubelement(const htmlElemDesc * elt) { - return htmlDefaultSubelement(elt); + return htmlDefaultSubelement(elt); } int __htmlElementAllowedHereDesc(const htmlElemDesc * parent, - const htmlElemDesc * elt) + const htmlElemDesc * elt) { - return htmlElementAllowedHereDesc(parent, elt); + return htmlElementAllowedHereDesc(parent, elt); } @@ -264,7 +264,7 @@ const char * * __htmlRequiredAttrs(const htmlElemDesc * elt) { - return htmlRequiredAttrs(elt); + return htmlRequiredAttrs(elt); } #endif diff --git a/os400/rpgsupport.h b/os400/rpgsupport.h index 6725b599..d8016d72 100644 --- a/os400/rpgsupport.h +++ b/os400/rpgsupport.h @@ -141,17 +141,17 @@ XMLPUBFUN void * __xmlVaArg(char * * list, void * dest, size_t argsize); XMLPUBFUN void __xmlVaEnd(char * * list); #ifdef LIBXML_XPATH_ENABLED -XMLPUBFUN int __xmlXPathNodeSetGetLength(xmlNodeSetPtr ns); -XMLPUBFUN xmlNodePtr __xmlXPathNodeSetItem(xmlNodeSetPtr ns, int index); -XMLPUBFUN int __xmlXPathNodeSetIsEmpty(xmlNodeSetPtr ns); +XMLPUBFUN int __xmlXPathNodeSetGetLength(xmlNodeSetPtr ns); +XMLPUBFUN xmlNodePtr __xmlXPathNodeSetItem(xmlNodeSetPtr ns, int index); +XMLPUBFUN int __xmlXPathNodeSetIsEmpty(xmlNodeSetPtr ns); #endif #ifdef LIBXML_HTML_ENABLED -XMLPUBFUN const char * __htmlDefaultSubelement(const htmlElemDesc * elt); -XMLPUBFUN int __htmlElementAllowedHereDesc(const htmlElemDesc * parent, - const htmlElemDesc * elt); +XMLPUBFUN const char * __htmlDefaultSubelement(const htmlElemDesc * elt); +XMLPUBFUN int __htmlElementAllowedHereDesc(const htmlElemDesc * parent, + const htmlElemDesc * elt); XMLPUBFUN const char * * - __htmlRequiredAttrs(const htmlElemDesc * elt); + __htmlRequiredAttrs(const htmlElemDesc * elt); #endif #endif diff --git a/os400/xmlcatalog.cmd b/os400/xmlcatalog.cmd new file mode 100644 index 00000000..92f02701 --- /dev/null +++ b/os400/xmlcatalog.cmd @@ -0,0 +1,112 @@ +/* XMLCATALOG CL command. */ +/* */ +/* See Copyright for the status of this software. */ +/* */ +/* Author: Patrick Monnerat <pm@datasphere.ch>, DATASPHERE S.A. */ + +/* Interface to program XMLCATLGCL */ + + CMD PROMPT('XML/SGML catalog tool') + + /* Catalog file path. */ + + PARM KWD(INSTMF) TYPE(*PNAME) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) MIN(1) SPCVAL((*NEW '')) + + CHOICE('Stream file path') + + PROMPT('XML/SGML catalog file') + + /* Catalog kind: XML/SGML. */ + + PARM KWD(KIND) TYPE(*CHAR) LEN(7) VARY(*YES *INT2) + + EXPR(*YES) RSTD(*YES) DFT(*XML) + + SPCVAL((*XML '') (*SGML '--sgml')) + + PROMPT('Catalog kind') + + /* Output file. */ + + PARM KWD(OUTSTMF) TYPE(*PNAME) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) DFT(*STDOUT) + + SPCVAL((*STDOUT '') (*INSTMF X'00')) + + CHOICE('*STDOUT, *INSTMF or file path') + + PROMPT('Output stream file path') + + /* Convert SGML to XML catalog. */ + + PARM KWD(CONVERT) TYPE(*CHAR) LEN(10) VARY(*YES *INT2) + + RSTD(*YES) SPCVAL((*YES '--convert') (*NO '')) + + EXPR(*YES) DFT(*NO) PMTCTL(TYPEXML) + + PROMPT('Convert SGML to XML catalog') + + /* SGML super catalog update. */ + + PARM KWD(SUPERUPD) TYPE(*CHAR) LEN(17) VARY(*YES *INT2) + + SPCVAL((*YES '') (*NO '--no-super-update')) + + EXPR(*YES) DFT(*YES) RSTD(*YES) PMTCTL(TYPESGML) + + PROMPT('Update the SGML super catalog') + + /* Verbose/debug output. */ + + PARM KWD(VERBOSE) TYPE(*CHAR) LEN(4) VARY(*YES *INT2) + + RSTD(*YES) SPCVAL((*YES '-v') (*NO '')) + + EXPR(*YES) DFT(*NO) + + PROMPT('Output debugging information') + + /* Interactive shell not supported. */ + + /* Values to delete. */ + + PARM KWD(DELETE) TYPE(*PNAME) LEN(256) VARY(*YES *INT2) + + CASE(*MIXED) MAX(64) EXPR(*YES) + + CHOICE('Identifier value') + + PROMPT('Delete System/URI identifier') + + /* Values to add. */ + + PARM KWD(ADD) TYPE(XMLELEM) MAX(10) PMTCTL(TYPEXML) + + PROMPT('Add definition') +XMLELEM: ELEM TYPE(*CHAR) LEN(16) VARY(*YES *INT2) DFT(*PUBLIC) + + PROMPT('Entry type') + + EXPR(*YES) RSTD(*YES) SPCVAL( + + (*PUBLIC 'public') + + (*SYSTEM 'system') + + (*URI 'uri') + + (*REWRITESYSTEM 'rewriteSystem') + + (*REWRITEURI 'rewriteURI') + + (*DELEGATEPUBLIC 'delegatePublic') + + (*DELEGATESYSTEM 'delegateSystem') + + (*DELEGATEURI 'delegateURI') + + (*NEXTCATALOG 'nextCatalog') + + ) + ELEM TYPE(*PNAME) LEN(256) VARY(*YES *INT2) EXPR(*YES) + + CASE(*MIXED) PROMPT('Original reference/file name') + ELEM TYPE(*PNAME) LEN(256) VARY(*YES *INT2) EXPR(*YES) + + CASE(*MIXED) PROMPT('Replacement entity URI') + + PARM KWD(SGMLADD) TYPE(SGMLELEM) MAX(10) + + PMTCTL(TYPESGML) PROMPT('Add SGML definition') +SGMLELEM: ELEM TYPE(*PNAME) LEN(256) VARY(*YES *INT2) EXPR(*YES) + + CASE(*MIXED) PROMPT('SGML catalog file name') + ELEM TYPE(*PNAME) LEN(256) VARY(*YES *INT2) EXPR(*YES) + + CASE(*MIXED) PROMPT('SGML definition') + + /* Entities to resolve. */ + + PARM KWD(ENTITY) TYPE(*PNAME) LEN(256) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) MAX(150) + + PROMPT('Resolve entity') + + /* Additional catalog files. */ + + PARM KWD(CATALOG) TYPE(*PNAME) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) MAX(150) DFT(*DEFAULT) + + CHOICE('Catalog stream file path') + + PROMPT('Additional catalog file') SPCVAL( + + (*DEFAULT '/etc/xml/catalog') + + (*NONE '') + + ) + + + /* Conditional prompting. */ + +TYPEXML: PMTCTL CTL(KIND) COND((*EQ '')) +TYPESGML: PMTCTL CTL(KIND) COND((*NE '')) diff --git a/os400/xmlcatlgcl.c b/os400/xmlcatlgcl.c new file mode 100644 index 00000000..6f1e4ff4 --- /dev/null +++ b/os400/xmlcatlgcl.c @@ -0,0 +1,288 @@ +/** +*** XMLCATALOG command response program. +*** +*** See Copyright for the status of this software. +*** +*** Author: Patrick Monnerat <pm@datasphere.ch>, DATASPHERE S.A. +**/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <qshell.h> + + +/* Variable-length string, with 16-bit length. */ +typedef struct { + short len; + char string[5000]; +} vary2; + + +/* Variable-length string, with 32-bit length. */ +typedef struct { + int len; + char string[5000]; +} vary4; + + +/* Multiple occurrence parameter list. */ +#define paramlist(itemsize, itemtype) \ + _Packed struct { \ + short len; \ + _Packed union { \ + char _pad[itemsize]; \ + itemtype param; \ + } item[1]; \ + } + +/* Add element list structure. */ +typedef struct { + short elcount; /* Element count (=3). */ + paramlist(16, char) type; /* vary2(16). */ + paramlist(256, char) origin; /* vary2(256). */ + paramlist(256, char) replace; /* vary2(256). */ +} addelement; + +/* SGML add element list structure. */ +typedef struct { + short elcount; /* Element count (=3). */ + paramlist(256, char) catalog; /* vary2(256). */ + paramlist(256, char) ident; /* vary2(256). */ +} sgmladdelement; + + +/* Arguments from CL command. */ +typedef struct { + char * pgm; /* Program name. */ + vary2 * instmf; /* Input catalog file name. */ + vary2 * kind; /* Catalog kind. */ + vary2 * outstmf; /* Output catalog file name. */ + vary2 * convert; /* Convert SGML to XML. */ + vary2 * superupd; /* --no-super-update. */ + vary2 * verbose; /* Verbose output. */ + paramlist(256 + 2, vary2) * delete; /* Identifiers to delete. */ + paramlist(2, unsigned short) * add; /* Items to add. */ + paramlist(2, unsigned short) * sgmladd; /* SGML items to add. */ + paramlist(256 + 2, vary2) * resolve; /* Identifiers to resolve. */ + paramlist(5000 + 2, vary2) * catalog; /* Additional catalog files. */ +} arguments; + + +/* Definition of QSHELL program. */ +extern void qshell(vary4 * cmd); +#pragma linkage(qshell, OS) +#pragma map(qshell, "QSHELL/QZSHQSHC") + +/* Macro to handle displacements. */ +#define OFFSETBY(t, p, n) ((t *) (((char *) (p)) + (n))) + + +static void +vary4nappend(vary4 * dst, const char * src, size_t len) + +{ + if (len > sizeof(dst->string) - dst->len) + len = sizeof(dst->string) - dst->len; + + if (len) { + memcpy(dst->string + dst->len, src, len); + dst->len += len; + } +} + + +static void +vary4append(vary4 * dst, const char * src) + +{ + vary4nappend(dst, src, strlen(src)); +} + + +static void +vary4arg(vary4 * dst, const char * arg) + +{ + vary4nappend(dst, " ", 1); + vary4append(dst, arg); +} + + +static void +vary4varg(vary4 * dst, vary2 * arg) + +{ + vary4nappend(dst, " ", 1); + vary4nappend(dst, arg->string, arg->len); +} + + +static void +vary4vescape(vary4 * dst, vary2 * arg) + +{ + int i; + + for (i = 0; i < arg->len; i++) + if (arg->string[i] == '\'') + vary4nappend(dst, "'\"'\"'", 5); + else + vary4nappend(dst, arg->string + i, 1); +} + + +static void +vary4vargquote(vary4 * dst, vary2 * arg) + +{ + vary4nappend(dst, " '", 2); + vary4vescape(dst, arg); + vary4nappend(dst, "'", 1); +} + + +int +main(int argsc, arguments * args) + +{ + vary4 cmd; + int i; + char c; + addelement * aelp; + sgmladdelement * saelp; + + /* Specify additional catalogs. */ + cmd.len = 0; + if (args->catalog->len) { + for (i = 0; i < args->catalog->len && + !args->catalog->item[i].param.len; i++) + ; + + vary4append(&cmd, "XML_CATALOG_FILES="); + if (i < args->catalog->len) { + c = '\''; + for (i = 0; i < args->catalog->len; i++) { + if (!args->catalog->item[i].param.len) + continue; + vary4nappend(&cmd, &c, 1); + c = ' '; + vary4vescape(&cmd, + &args->catalog->item[i].param); + } + vary4nappend(&cmd, "'", 1); + } + vary4nappend(&cmd, " ", 1); + } + + /* find length of library name. */ + for (i = 0; i < 10 && args->pgm[i] && args->pgm[i] != '/'; i++) + ; + + /* Store program name in command buffer. */ + vary4append(&cmd, "/QSYS.LIB/"); + vary4nappend(&cmd, args->pgm, i); + vary4append(&cmd, ".LIB/XMLCATALOG.PGM"); + + /* Map command arguments to standard xmlcatalog argument vector. */ + if (args->kind && args->kind->len) + vary4varg(&cmd, args->kind); + + if (args->verbose && args->verbose->len) + vary4varg(&cmd, args->verbose); + + if (args->delete) + for (i = 0; i < args->delete->len; i++) { + vary4arg(&cmd, "--del"); + vary4vargquote(&cmd, &args->delete->item[i].param); + } + + if (args->kind && args->kind->len) { + /* Process SGML-specific parameters. */ + if (args->superupd && args->superupd->len) + vary4varg(&cmd, args->superupd); + + if (args->sgmladd) + for (i = 0; i < args->sgmladd->len; i++) { + saelp = OFFSETBY(sgmladdelement, args->sgmladd, + args->sgmladd->item[i].param); + if (!((vary2 *) &saelp->catalog)->len) + continue; + vary4arg(&cmd, "--add"); + vary4vargquote(&cmd, (vary2 *) &saelp->catalog); + vary4vargquote(&cmd, (vary2 *) &saelp->ident); + } + } + else { + /* Process XML-specific parameters. */ + if (args->convert && args->convert->len) + vary4varg(&cmd, args->convert); + + if (args->add) + for (i = 0; i < args->add->len; i++) { + aelp = OFFSETBY(addelement, args->add, + args->add->item[i].param); + if (!((vary2 *) &aelp->origin)->len) + continue; + vary4arg(&cmd, "--add"); + vary4varg(&cmd, (vary2 *) &aelp->type); + vary4vargquote(&cmd, (vary2 *) &aelp->origin); + vary4vargquote(&cmd, (vary2 *) &aelp->replace); + } + } + + /* Avoid INSTMF(*NEW) and OUTSMTF(*INSTMF). */ + if (args->outstmf && args->outstmf->len && !args->outstmf->string[0]) + if (args->instmf && args->instmf->len) + args->outstmf = args->instmf; + else + args->outstmf = NULL; + + /* If INSTMF(*NEW) and OUTSTMF(somepath), Use --create --noout and + somepath as (unexisting) input file. */ + if (args->outstmf && args->outstmf->len) + if (!args->instmf || !args->instmf->len) { + vary4arg(&cmd, "--create"); + vary4arg(&cmd, "--noout"); + args->instmf = args->outstmf; + args->outstmf = NULL; + } + + /* If output to input file, use --noout option. */ + if (args->instmf && args->outstmf && args->instmf->len && + args->instmf->len == args->outstmf->len && + !strncmp(args->instmf->string, args->outstmf->string, + args->instmf->len)) { + vary4arg(&cmd, "--noout"); + args->outstmf = NULL; + } + + /* If no input file create catalog, else specify the input file name. */ + /* Specify the input file name: my be a dummy one. */ + if (!args->instmf || !args->instmf->len) { + vary4arg(&cmd, "--create -"); + vary4arg(&cmd, ".dmyxmlcatalog"); + } + else { + vary4arg(&cmd, "-"); + vary4vargquote(&cmd, args->instmf); + } + + /* Query entities. */ + + if (args->resolve) + for (i = 0; i < args->resolve->len; i++) + vary4vargquote(&cmd, &args->resolve->item[i].param); + + /* Redirect output if requested. */ + if (args->outstmf && args->outstmf->len) { + vary4arg(&cmd, ">"); + vary4vargquote(&cmd, args->outstmf); + } + + /* Execute the shell command. */ + qshell(&cmd); + + /* Terminate. */ + exit(0); +} diff --git a/os400/xmllint.cmd b/os400/xmllint.cmd new file mode 100644 index 00000000..1582837f --- /dev/null +++ b/os400/xmllint.cmd @@ -0,0 +1,146 @@ +/* XMLLINT CL command. */ +/* */ +/* See Copyright for the status of this software. */ +/* */ +/* Author: Patrick Monnerat <pm@datasphere.ch>, DATASPHERE S.A. */ + +/* Interface to program XMLLINTCL */ + + CMD PROMPT('XML tool') + + /* XML input file location. */ + + PARM KWD(STMF) TYPE(*PNAME) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) MIN(1) + + CHOICE('Stream file path') + + PROMPT('XML Stream file') + + /* DTD location. */ + + PARM KWD(DTD) TYPE(*PNAME) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) PASSVAL(*NULL) + + CHOICE('ID, URL or stream file path') + + PROMPT('DTD id, URL or file path') + + PARM KWD(DTDLOCATOR) TYPE(*CHAR) LEN(8) DFT(*DTDURL) + + SPCVAL(*DTDURL *DTDFPI) EXPR(*YES) RSTD(*YES) + + PROMPT('DTD locator is URL/FPI') + + /* Schema location. */ + + PARM KWD(SCHEMA) TYPE(*PNAME) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) PASSVAL(*NULL) + + CHOICE('URL or stream file path') + + PROMPT('Schema URL or stream file path') + + PARM KWD(SCHEMAKIND) TYPE(*CHAR) LEN(12) VARY(*YES *INT2) + + RSTD(*YES) DFT(*XSD) + + PROMPT('Validating schema kind') + + CHOICE('Keyword') SPCVAL( + + (*XSD '--schema') + + (*RELAXNG '--relaxng') + + (*SCHEMATRON '--schematron') + + ) + + /* Output location. */ + + PARM KWD(OUTSTMF) TYPE(*PNAME) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) PASSVAL(*NULL) + + CHOICE('Stream file path') + + PROMPT('Output stream file path') + + /* Other parameters with arguments. */ + + PARM KWD(XPATH) TYPE(*CHAR) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) PASSVAL(*NULL) + + CHOICE('XPath expression') + + PROMPT('XPath filter') + + PARM KWD(PATTERN) TYPE(*CHAR) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) PASSVAL(*NULL) + + CHOICE('Reader pattern') + + PROMPT('Reader node filter') + + /* Paths for resources. */ + + PARM KWD(PATH) TYPE(*PNAME) LEN(5000) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) MAX(64) + + CHOICE('IFS directory path') + + PROMPT('Path for resources') + + PARM KWD(PRETTY) TYPE(*CHAR) LEN(11) VARY(*YES *INT2) + + RSTD(*YES) DFT(*NONE) + + PROMPT('Pretty-print style') + + CHOICE('Keyword') SPCVAL( + + (*NONE '0') + + (*FORMAT '1') + + (*WHITESPACE '2') + + ) + + PARM KWD(MAXMEM) TYPE(*UINT4) EXPR(*YES) DFT(0) + + CHOICE('Number of bytes') + + PROMPT('Maximum dynamic memory') + + PARM KWD(ENCODING) TYPE(*CHAR) LEN(32) VARY(*YES *INT2) + + CASE(*MIXED) EXPR(*YES) PASSVAL(*NULL) + + PMTCTL(ENCODING) CHOICE('Encoding name') + + PROMPT('Output character encoding') +ENCODING: PMTCTL CTL(OUTSTMF) COND(*SPCFD) + + /* Boolean options. */ + /* --shell is not supported from command mode. */ + + PARM KWD(OPTIONS) TYPE(*CHAR) LEN(20) VARY(*YES *INT2) + + MAX(50) RSTD(*YES) PROMPT('Options') + + CHOICE('Keyword') SPCVAL( + + (*VERSION '--version') + + (*DEBUG '--debug') + + (*DEBUGENT '--debugent') + + (*COPY '--copy') + + (*RECOVER '--recover') + + (*HUGE '--huge') + + (*NOENT '--noent') + + (*NOENC '--noenc') + + (*NOOUT '--noout') + + (*LOADTRACE '--load-trace') + + (*NONET '--nonet') + + (*NOCOMPACT '--nocompact') + + (*HTMLOUT '--htmlout') + + (*NOWRAP '--nowrap') + + (*VALID '--valid') + + (*POSTVALID '--postvalid') + + (*TIMING '--timing') + + (*REPEAT '--repeat') + + (*INSERT '--insert') + + (*COMPRESS '--compress') + + (*HTML '--html') + + (*XMLOUT '--xmlout') + + (*NODEFDTD '--nodefdtd') + + (*PUSH '--push') + + (*PUSHSMALL '--pushsmall') + + (*MEMORY '--memory') + + (*NOWARNING '--nowarning') + + (*NOBLANKS '--noblanks') + + (*NOCDATA '--nocdata') + + (*FORMAT '--format') + + (*DROPDTD '--dropdtd') + + (*NSCLEAN '--nsclean') + + (*TESTIO '--testIO') + + (*CATALOGS '--catalogs') + + (*NOCATALOGS '--nocatalogs') + + (*AUTO '--auto') + + (*XINCLUDE '--xinclude') + + (*NOXINCLUDENODE '--noxincludenode') + + (*NOFIXUPBASEURIS '--nofixup-base-uris') + + (*LOADDTD '--loaddtd') + + (*DTDATTR '--dtdattr') + + (*STREAM '--stream') + + (*WALKER '--walker') + + (*CHKREGISTER '--chkregister') + + (*C14N '--c14n') + + (*C14N11 '--c14n11') + + (*EXCC14N '--exc-c14n') + + (*SAX1 '--sax1') + + (*SAX '--sax') + + (*OLDXML10 '--oldxml10') + + ) diff --git a/os400/xmllintcl.c b/os400/xmllintcl.c new file mode 100644 index 00000000..12263853 --- /dev/null +++ b/os400/xmllintcl.c @@ -0,0 +1,216 @@ +/** +*** XMLLINT command response program. +*** +*** See Copyright for the status of this software. +*** +*** Author: Patrick Monnerat <pm@datasphere.ch>, DATASPHERE S.A. +**/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <qshell.h> + + +/* Variable-length string, with 16-bit length. */ +typedef struct { + short len; + char string[5000]; +} vary2; + + +/* Variable-length string, with 32-bit length. */ +typedef struct { + int len; + char string[5000]; +} vary4; + + +/* Multiple occurrence parameter list. */ +#define paramlist(itemsize, itemtype) \ + _Packed struct { \ + short len; \ + union { \ + char _pad[itemsize]; \ + itemtype param; \ + } item[1]; \ + } + + +/* Arguments from CL command. */ +typedef struct { + char * pgm; /* Program name. */ + vary2 * stmf; /* XML file name or URL. */ + vary2 * dtd; /* DTD location or public identifier. */ + char * dtdvalid; /* *DTDURL or *DTDFPI. */ + vary2 * schema; /* Schema file name or URL. */ + vary2 * schemakind; /* --schema/--relaxng/--schematron. */ + vary2 * outstmf; /* Output stream file name. */ + vary2 * xpath; /* XPath filter. */ + vary2 * pattern; /* Reader filter pattern. */ + paramlist(5000 + 2, vary2) * path; /* Path for resources. */ + vary2 * pretty; /* Pretty-print style. */ + unsigned long * maxmem; /* Maximum dynamic memory. */ + vary2 * encoding; /* Output encoding. */ + paramlist(20 + 2, vary2) * options; /* Other options. */ +} arguments; + + +/* Definition of QSHELL program. */ +extern void qshell(vary4 * cmd); +#pragma linkage(qshell, OS) +#pragma map(qshell, "QSHELL/QZSHQSHC") + + +static void +vary4nappend(vary4 * dst, const char * src, size_t len) + +{ + if (len > sizeof(dst->string) - dst->len) + len = sizeof(dst->string) - dst->len; + + if (len) { + memcpy(dst->string + dst->len, src, len); + dst->len += len; + } +} + + +static void +vary4append(vary4 * dst, const char * src) + +{ + vary4nappend(dst, src, strlen(src)); +} + + +static void +vary4arg(vary4 * dst, const char * arg) + +{ + vary4nappend(dst, " ", 1); + vary4append(dst, arg); +} + + +static void +vary4varg(vary4 * dst, vary2 * arg) + +{ + vary4nappend(dst, " ", 1); + vary4nappend(dst, arg->string, arg->len); +} + + +static void +vary4vescape(vary4 * dst, vary2 * arg) + +{ + int i; + + for (i = 0; i < arg->len; i++) + if (arg->string[i] == '\'') + vary4nappend(dst, "'\"'\"'", 5); + else + vary4nappend(dst, arg->string + i, 1); +} + + +static void +vary4vargquote(vary4 * dst, vary2 * arg) + +{ + vary4nappend(dst, " '", 2); + vary4vescape(dst, arg); + vary4nappend(dst, "'", 1); +} + + +int +main(int argsc, arguments * args) + +{ + vary4 cmd; + int i; + char textbuf[20]; + char * lang; + + /* find length of library name. */ + for (i = 0; i < 10 && args->pgm[i] && args->pgm[i] != '/'; i++) + ; + + /* Store program name in command buffer. */ + cmd.len = 0; + vary4append(&cmd, "/QSYS.LIB/"); + vary4nappend(&cmd, args->pgm, i); + vary4append(&cmd, ".LIB/XMLLINT.PGM"); + + /* Map command arguments to standard xmllint argument vector. */ + + if (args->dtd && args->dtd->len) { + if (args->dtdvalid && args->dtdvalid[4] == 'F') + vary4arg(&cmd, "--dtdvalidfpi"); + else + vary4arg(&cmd, "--dtdvalid"); + + vary4vargquote(&cmd, args->dtd); + } + + if (args->schema && args->schema->len) { + vary4varg(&cmd, args->schemakind); + vary4vargquote(&cmd, args->schema); + } + + if (args->outstmf && args->outstmf->len) { + vary4arg(&cmd, "--output"); + vary4vargquote(&cmd, args->outstmf); + + if (args->encoding && args->encoding->len) { + vary4arg(&cmd, "--encoding"); + vary4vargquote(&cmd, args->encoding); + } + } + + if (args->xpath && args->xpath->len) { + vary4arg(&cmd, "--xpath"); + vary4vargquote(&cmd, args->xpath); + } + + if (args->pattern && args->pattern->len) { + vary4arg(&cmd, "--pattern"); + vary4vargquote(&cmd, args->pattern); + } + + if (args->path && args->path->len) { + vary4arg(&cmd, "--path '"); + vary4vescape(&cmd, &args->path->item[0].param); + for (i = 1; i < args->path->len; i++) { + vary4nappend(&cmd, ":", 1); + vary4vescape(&cmd, &args->path->item[i].param); + } + vary4nappend(&cmd, "'", 1); + } + + if (args->pretty && args->pretty->len && + args->pretty->string[0] != '0') { + vary4arg(&cmd, "--pretty"); + vary4varg(&cmd, args->pretty); + } + + if (args->maxmem && *args->maxmem) { + snprintf(textbuf, sizeof textbuf, "%lu", *args->maxmem); + vary4arg(&cmd, "--maxmem"); + vary4arg(&cmd, textbuf); + } + + for (i = 0; i < args->options->len; i++) + vary4varg(&cmd, &args->options->item[i].param); + + vary4vargquote(&cmd, args->stmf); + + /* Execute the shell command. */ + qshell(&cmd); + + /* Terminate. */ + exit(0); +} |