[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1990: apply cleanups to libxslt import (from stewb, bug 3549)
Mats Wichmann
mats at linuxfoundation.org
Wed Sep 26 13:53:26 UTC 2012
------------------------------------------------------------
revno: 1990
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2012-09-26 07:53:26 -0600
message:
apply cleanups to libxslt import (from stewb, bug 3549)
modified:
headers/All/5.0/libxslt/numbersInternals.h.defs
headers/All/5.0/libxslt/xsltInternals.h.defs
headers/libxslt/attributes.h
headers/libxslt/documents.h
headers/libxslt/extensions.h
headers/libxslt/extra.h
headers/libxslt/imports.h
headers/libxslt/keys.h
headers/libxslt/namespaces.h
headers/libxslt/numbersInternals.h
headers/libxslt/pattern.h
headers/libxslt/preproc.h
headers/libxslt/security.h
headers/libxslt/templates.h
headers/libxslt/transform.h
headers/libxslt/variables.h
headers/libxslt/xsltInternals.h
headers/libxslt/xsltutils.h
package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/libxslt/numbersInternals.h.defs'
--- a/headers/All/5.0/libxslt/numbersInternals.h.defs 2012-09-07 18:06:08 +0000
+++ b/headers/All/5.0/libxslt/numbersInternals.h.defs 2012-09-26 13:53:26 +0000
@@ -1,3 +1,26 @@
-typedef struct _xsltNumberData xsltNumberData;
+typedef struct _xsltNumberData {
+ const unsigned char *level;
+ const unsigned char *count;
+ const unsigned char *from;
+ const unsigned char *value;
+ const unsigned char *format;
+ int has_format;
+ int digitsPerGroup;
+ int groupingCharacter;
+ int groupingCharacterLen;
+ xmlDocPtr doc;
+ xmlNodePtr node;
+} xsltNumberData;
typedef xsltNumberData *xsltNumberDataPtr;
+typedef struct _xsltFormatNumberInfo {
+ int integer_hash;
+ int integer_digits;
+ int frac_digits;
+ int frac_hash;
+ int group;
+ int multiplier;
+ char add_decimal;
+ char is_multiplier_set;
+ char is_negative_pattern;
+} xsltFormatNumberInfo;
=== modified file 'headers/All/5.0/libxslt/xsltInternals.h.defs'
--- a/headers/All/5.0/libxslt/xsltInternals.h.defs 2012-09-12 13:52:21 +0000
+++ b/headers/All/5.0/libxslt/xsltInternals.h.defs 2012-09-26 13:53:26 +0000
@@ -14,21 +14,212 @@
#define CHECK_STOPPED0 if (ctxt->state == XSLT_STATE_STOPPED) return(0);
#define CHECK_STOPPED if (ctxt->state == XSLT_STATE_STOPPED) return;
-typedef struct _xsltRuntimeExtra xsltRuntimeExtra;
+typedef struct _xsltRuntimeExtra {
+ void *info;
+ xmlFreeFunc deallocate;
+ union {
+ void *ptr;
+ int ival;
+ } val;
+ union {
+ void *ptr;
+ int ival;
+ }._47;
+} xsltRuntimeExtra;
typedef xsltRuntimeExtra *xsltRuntimeExtraPtr;
-typedef struct _xsltTemplate xsltTemplate;
+typedef struct _xsltTemplate {
+ struct _xsltTemplate *next;
+ struct _xsltStylesheet *style;
+ xmlChar *match;
+ float priority;
+ const unsigned char *name;
+ const unsigned char *nameURI;
+ const unsigned char *mode;
+ const unsigned char *modeURI;
+ xmlNodePtr content;
+ xmlNodePtr elem;
+ int inheritedNsNr;
+ xmlNs **inheritedNs;
+ int nbCalls;
+ unsigned long int time;
+ void *params;
+} xsltTemplate;
typedef xsltTemplate *xsltTemplatePtr;
-typedef struct _xsltDecimalFormat xsltDecimalFormat;
+typedef struct _xsltDecimalFormat {
+ struct _xsltDecimalFormat *next;
+ xmlChar *name;
+ xmlChar *digit;
+ xmlChar *patternSeparator;
+ xmlChar *minusSign;
+ xmlChar *infinity;
+ xmlChar *noNumber;
+ xmlChar *decimalPoint;
+ xmlChar *grouping;
+ xmlChar *percent;
+ xmlChar *permille;
+ xmlChar *zeroDigit;
+} xsltDecimalFormat;
typedef xsltDecimalFormat *xsltDecimalFormatPtr;
-typedef struct _xsltDocument xsltDocument;
+typedef struct _xsltDocument {
+ struct _xsltDocument *next;
+ int main;
+ xmlDocPtr doc;
+ void *keys;
+ struct _xsltDocument *includes;
+ int preproc;
+ int nbKeysComputed;
+} xsltDocument;
typedef xsltDocument *xsltDocumentPtr;
-typedef struct _xsltKeyDef xsltKeyDef;
+typedef struct _xsltKeyDef {
+ struct _xsltKeyDef *next;
+ xmlNodePtr inst;
+ xmlChar *name;
+ xmlChar *nameURI;
+ xmlChar *match;
+ xmlChar *use;
+ xmlXPathCompExprPtr comp;
+ xmlXPathCompExprPtr usecomp;
+ xmlNs **nsList;
+ int nsNr;
+} xsltKeyDef;
typedef xsltKeyDef *xsltKeyDefPtr;
-typedef struct _xsltStylesheet xsltStylesheet;
+typedef struct _xsltKeyTable {
+ struct _xsltKeyTable *next;
+ xmlChar *name;
+ xmlChar *nameURI;
+ xmlHashTablePtr keys;
+} xsltKeyTable;
+typedef struct _xsltStylesheet {
+ struct _xsltStylesheet *parent;
+ struct _xsltStylesheet *next;
+ struct _xsltStylesheet *imports;
+ xsltDocumentPtr docList;
+ xmlDocPtr doc;
+ xmlHashTablePtr stripSpaces;
+ int stripAll;
+ xmlHashTablePtr cdataSection;
+ xsltStackElemPtr variables;
+ xsltTemplatePtr templates;
+ void *templatesHash;
+ void *rootMatch;
+ void *keyMatch;
+ void *elemMatch;
+ void *attrMatch;
+ void *parentMatch;
+ void *textMatch;
+ void *piMatch;
+ void *commentMatch;
+ xmlHashTablePtr nsAliases;
+ xmlHashTablePtr attributeSets;
+ xmlHashTablePtr nsHash;
+ void *nsDefs;
+ void *keys;
+ xmlChar *method;
+ xmlChar *methodURI;
+ xmlChar *version;
+ xmlChar *encoding;
+ int omitXmlDeclaration;
+ xsltDecimalFormatPtr decimalFormat;
+ int standalone;
+ xmlChar *doctypePublic;
+ xmlChar *doctypeSystem;
+ int indent;
+ xmlChar *mediaType;
+ xsltElemPreCompPtr preComps;
+ int warnings;
+ int errors;
+ xmlChar *exclPrefix;
+ xmlChar **exclPrefixTab;
+ int exclPrefixNr;
+ int exclPrefixMax;
+ void *_private;
+ xmlHashTablePtr extInfos;
+ int extrasNr;
+ xsltDocumentPtr includes;
+ xmlDictPtr dict;
+ void *attVTs;
+ const unsigned char *defaultAlias;
+ int nopreproc;
+ int internalized;
+ int literal_result;
+ xsltStylesheetPtr principal;
+} xsltStylesheet;
typedef xsltStylesheet *xsltStylesheetPtr;
-typedef struct _xsltTransformContext xsltTransformContext;
+typedef struct _xsltTransformContext {
+ xsltStylesheetPtr style;
+ xsltOutputType type;
+ xsltTemplatePtr templ;
+ int templNr;
+ int templMax;
+ xsltTemplatePtr *templTab;
+ xsltStackElemPtr vars;
+ int varsNr;
+ int varsMax;
+ xsltStackElemPtr *varsTab;
+ int varsBase;
+ xmlHashTablePtr extFunctions;
+ xmlHashTablePtr extElements;
+ xmlHashTablePtr extInfos;
+ const unsigned char *mode;
+ const unsigned char *modeURI;
+ xsltDocumentPtr docList;
+ xsltDocumentPtr document;
+ xmlNode *node;
+ xmlNodeSetPtr nodeList;
+ xmlDocPtr output;
+ xmlNode *insert;
+ xmlXPathContextPtr xpathCtxt;
+ xsltTransformState state;
+ xmlHashTablePtr globalVars;
+ xmlNode *inst;
+ int xinclude;
+ const char *outputFile;
+ int profile;
+ long int prof;
+ int profNr;
+ int profMax;
+ long int *profTab;
+ void *_private;
+ int extrasNr;
+ int extrasMax;
+ xsltRuntimeExtraPtr extras;
+ xsltDocumentPtr styleList;
+ void *sec;
+ xmlGenericErrorFunc error;
+ void *errctx;
+ xsltSortFunc sortfunc;
+ xmlDocPtr tmpRVT;
+ xmlDocPtr persistRVT;
+ int ctxtflags;
+ const unsigned char *lasttext;
+ unsigned int lasttsize;
+ unsigned int lasttuse;
+ int debugStatus;
+ unsigned long int *traceCode;
+ int parserOptions;
+ xmlDictPtr dict;
+ xmlDocPtr tmpDoc;
+ int internalized;
+ int nbKeys;
+ int hasTemplKeyPatterns;
+ xsltTemplatePtr currentTemplateRule;
+ xmlNode *initialContextNode;
+ xmlDocPtr initialContextDoc;
+ xsltTransformCachePtr cache;
+ void *contextVariable;
+ xmlDocPtr localRVT;
+ xmlDocPtr localRVTBase;
+ int keyInitLevel;
+ int funcLevel;
+} xsltTransformContext;
typedef xsltTransformContext *xsltTransformContextPtr;
-typedef struct _xsltElemPreComp xsltElemPreComp;
+typedef struct _xsltElemPreComp {
+ xsltElemPreCompPtr next;
+ xsltStyleType type;
+ xsltTransformFunction func;
+ xmlNode *inst;
+ xsltElemPreCompDeallocator free;
+} xsltElemPreComp;
typedef xsltElemPreComp *xsltElemPreCompPtr;
typedef void (*xsltTransformFunction) (void);
typedef void (*xsltSortFunc) (void);
@@ -57,11 +248,64 @@
XSLT_FUNC_EXTENSION
} xsltStyleType;
typedef void (*xsltElemPreCompDeallocator) (void);
-typedef struct _xsltStylePreComp xsltStylePreComp;
+typedef struct _xsltStylePreComp {
+ xsltElemPreCompPtr next;
+ xsltStyleType type;
+ xsltTransformFunction func;
+ xmlNode *inst;
+ const unsigned char *stype;
+ int has_stype;
+ int number;
+ const unsigned char *order;
+ int has_order;
+ int descending;
+ const unsigned char *lang;
+ int has_lang;
+ xsltLocale locale;
+ const unsigned char *case_order;
+ int lower_first;
+ const unsigned char *use;
+ int has_use;
+ int noescape;
+ const unsigned char *name;
+ int has_name;
+ const unsigned char *ns;
+ int has_ns;
+ const unsigned char *mode;
+ const unsigned char *modeURI;
+ const unsigned char *test;
+ xsltTemplatePtr templ;
+ const unsigned char *select;
+ int ver11;
+ const unsigned char *filename;
+ int has_filename;
+ xsltNumberData numdata;
+ xmlXPathCompExprPtr comp;
+ xmlNs **nsList;
+ int nsNr;
+} xsltStylePreComp;
typedef xsltStylePreComp *xsltStylePreCompPtr;
-typedef struct _xsltStackElem xsltStackElem;
+typedef struct _xsltStackElem {
+ struct _xsltStackElem *next;
+ xsltStylePreCompPtr comp;
+ int computed;
+ const unsigned char *name;
+ const unsigned char *nameURI;
+ const unsigned char *select;
+ xmlNode *tree;
+ xmlXPathObjectPtr value;
+ xmlDocPtr fragment;
+ int level;
+ xsltTransformContextPtr context;
+ int flags;
+} xsltStackElem;
typedef xsltStackElem *xsltStackElemPtr;
-typedef struct _xsltTransformCache xsltTransformCache;
+typedef struct _xsltTransformCache {
+ xmlDocPtr RVT;
+ int nbRVT;
+ xsltStackElemPtr stackItems;
+ int nbStackItems;
+} xsltTransformCache;
typedef xsltTransformCache *xsltTransformCachePtr;
typedef enum {
XSLT_OUTPUT_XML,
=== modified file 'headers/libxslt/attributes.h'
--- a/headers/libxslt/attributes.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/attributes.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,10 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
+#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/documents.h'
--- a/headers/libxslt/documents.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/documents.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,10 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
+#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/extensions.h'
--- a/headers/libxslt/extensions.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/extensions.h 2012-09-26 13:53:26 +0000
@@ -5,6 +5,8 @@
#include <stdio.h>
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
#include <libxml2/libxml/entities.h>
#include <libxml2/libxml/hash.h>
#include <libxml2/libxml/xpath.h>
=== modified file 'headers/libxslt/extra.h'
--- a/headers/libxslt/extra.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/extra.h 2012-09-26 13:53:26 +0000
@@ -4,7 +4,12 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
#include <libxml2/libxml/xpath.h>
+#include <libxslt/numbersInternals.h>
+#include <libxslt/xsltlocale.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/imports.h'
--- a/headers/libxslt/imports.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/imports.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,10 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
+#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/keys.h'
--- a/headers/libxslt/keys.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/keys.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,9 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
#include <libxml2/libxml/xmlIO.h>
#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
=== modified file 'headers/libxslt/namespaces.h'
--- a/headers/libxslt/namespaces.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/namespaces.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,10 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
+#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/numbersInternals.h'
--- a/headers/libxslt/numbersInternals.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/numbersInternals.h 2012-09-26 13:53:26 +0000
@@ -2,6 +2,7 @@
#ifndef _LIBXSLT_NUMBERSINTERNALS_H_
#define _LIBXSLT_NUMBERSINTERNALS_H_
+#include <libxml2/libxml/tree.h>
#ifdef __cplusplus
extern "C" {
@@ -12,6 +13,34 @@
typedef xsltNumberData *xsltNumberDataPtr;
+ typedef struct _xsltFormatNumberInfo xsltFormatNumberInfo;
+
+ struct _xsltNumberData {
+ const unsigned char *level;
+ const unsigned char *count;
+ const unsigned char *from;
+ const unsigned char *value;
+ const unsigned char *format;
+ int has_format;
+ int digitsPerGroup;
+ int groupingCharacter;
+ int groupingCharacterLen;
+ xmlDocPtr doc;
+ xmlNodePtr node;
+ };
+
+ struct _xsltFormatNumberInfo {
+ int integer_hash;
+ int integer_digits;
+ int frac_digits;
+ int frac_hash;
+ int group;
+ int multiplier;
+ char add_decimal;
+ char is_multiplier_set;
+ char is_negative_pattern;
+ };
+
#ifdef __cplusplus
}
#endif
=== modified file 'headers/libxslt/pattern.h'
--- a/headers/libxslt/pattern.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/pattern.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,10 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
+#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/preproc.h'
--- a/headers/libxslt/preproc.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/preproc.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,8 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/security.h'
--- a/headers/libxslt/security.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/security.h 2012-09-26 13:53:26 +0000
@@ -2,6 +2,11 @@
#ifndef _LIBXSLT_SECURITY_H_
#define _LIBXSLT_SECURITY_H_
+#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
+#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/templates.h'
--- a/headers/libxslt/templates.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/templates.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,9 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
=== modified file 'headers/libxslt/transform.h'
--- a/headers/libxslt/transform.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/transform.h 2012-09-26 13:53:26 +0000
@@ -6,9 +6,14 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
#include <libxml2/libxml/entities.h>
+#include <libxml2/libxml/hash.h>
#include <libxml2/libxml/SAX2.h>
+#include <libxml2/libxml/xpath.h>
#include <libxml2/libxml/parser.h>
+#include <libxslt/numbersInternals.h>
+#include <libxslt/xsltlocale.h>
#include <libxslt/xsltInternals.h>
#ifdef __cplusplus
=== modified file 'headers/libxslt/variables.h'
--- a/headers/libxslt/variables.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/variables.h 2012-09-26 13:53:26 +0000
@@ -4,6 +4,9 @@
#include <libxml2/libxml/xmlstring.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
=== modified file 'headers/libxslt/xsltInternals.h'
--- a/headers/libxslt/xsltInternals.h 2012-09-12 13:52:21 +0000
+++ b/headers/libxslt/xsltInternals.h 2012-09-26 13:53:26 +0000
@@ -3,9 +3,15 @@
#define _LIBXSLT_XSLTINTERNALS_H_
#include <libxml2/libxml/xmlstring.h>
+#include <libxml2/libxml/xmlmemory.h>
#include <libxml2/libxml/tree.h>
+#include <libxml2/libxml/xmlerror.h>
+#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/entities.h>
+#include <libxml2/libxml/hash.h>
#include <libxml2/libxml/xpath.h>
#include <libxslt/numbersInternals.h>
+#include <libxslt/xsltlocale.h>
#ifdef __cplusplus
extern "C" {
@@ -48,6 +54,8 @@
typedef xsltKeyDef *xsltKeyDefPtr;
+ typedef struct _xsltKeyTable xsltKeyTable;
+
typedef struct _xsltStylesheet xsltStylesheet;
typedef xsltStylesheet *xsltStylesheetPtr;
@@ -115,6 +123,273 @@
XSLT_STATE_STOPPED
} xsltTransformState;
+ struct _xsltRuntimeExtra {
+ void *info;
+ xmlFreeFunc deallocate;
+ union {
+ void *ptr;
+ int ival;
+ } val;
+ union {
+ void *ptr;
+ int ival;
+ }._47;
+ };
+
+ struct _xsltTemplate {
+ struct _xsltTemplate *next;
+ struct _xsltStylesheet *style;
+ xmlChar *match;
+ float priority;
+ const unsigned char *name;
+ const unsigned char *nameURI;
+ const unsigned char *mode;
+ const unsigned char *modeURI;
+ xmlNodePtr content;
+ xmlNodePtr elem;
+ int inheritedNsNr;
+ xmlNs **inheritedNs;
+ int nbCalls;
+ unsigned long int time;
+ void *params;
+ };
+
+ struct _xsltDecimalFormat {
+ struct _xsltDecimalFormat *next;
+ xmlChar *name;
+ xmlChar *digit;
+ xmlChar *patternSeparator;
+ xmlChar *minusSign;
+ xmlChar *infinity;
+ xmlChar *noNumber;
+ xmlChar *decimalPoint;
+ xmlChar *grouping;
+ xmlChar *percent;
+ xmlChar *permille;
+ xmlChar *zeroDigit;
+ };
+
+ struct _xsltDocument {
+ struct _xsltDocument *next;
+ int main;
+ xmlDocPtr doc;
+ void *keys;
+ struct _xsltDocument *includes;
+ int preproc;
+ int nbKeysComputed;
+ };
+
+ struct _xsltKeyDef {
+ struct _xsltKeyDef *next;
+ xmlNodePtr inst;
+ xmlChar *name;
+ xmlChar *nameURI;
+ xmlChar *match;
+ xmlChar *use;
+ xmlXPathCompExprPtr comp;
+ xmlXPathCompExprPtr usecomp;
+ xmlNs **nsList;
+ int nsNr;
+ };
+
+ struct _xsltKeyTable {
+ struct _xsltKeyTable *next;
+ xmlChar *name;
+ xmlChar *nameURI;
+ xmlHashTablePtr keys;
+ };
+
+ struct _xsltElemPreComp {
+ xsltElemPreCompPtr next;
+ xsltStyleType type;
+ xsltTransformFunction func;
+ xmlNode *inst;
+ xsltElemPreCompDeallocator free;
+ };
+
+ struct _xsltStylePreComp {
+ xsltElemPreCompPtr next;
+ xsltStyleType type;
+ xsltTransformFunction func;
+ xmlNode *inst;
+ const unsigned char *stype;
+ int has_stype;
+ int number;
+ const unsigned char *order;
+ int has_order;
+ int descending;
+ const unsigned char *lang;
+ int has_lang;
+ xsltLocale locale;
+ const unsigned char *case_order;
+ int lower_first;
+ const unsigned char *use;
+ int has_use;
+ int noescape;
+ const unsigned char *name;
+ int has_name;
+ const unsigned char *ns;
+ int has_ns;
+ const unsigned char *mode;
+ const unsigned char *modeURI;
+ const unsigned char *test;
+ xsltTemplatePtr templ;
+ const unsigned char *select;
+ int ver11;
+ const unsigned char *filename;
+ int has_filename;
+ xsltNumberData numdata;
+ xmlXPathCompExprPtr comp;
+ xmlNs **nsList;
+ int nsNr;
+ };
+
+ struct _xsltStackElem {
+ struct _xsltStackElem *next;
+ xsltStylePreCompPtr comp;
+ int computed;
+ const unsigned char *name;
+ const unsigned char *nameURI;
+ const unsigned char *select;
+ xmlNode *tree;
+ xmlXPathObjectPtr value;
+ xmlDocPtr fragment;
+ int level;
+ xsltTransformContextPtr context;
+ int flags;
+ };
+
+ struct _xsltStylesheet {
+ struct _xsltStylesheet *parent;
+ struct _xsltStylesheet *next;
+ struct _xsltStylesheet *imports;
+ xsltDocumentPtr docList;
+ xmlDocPtr doc;
+ xmlHashTablePtr stripSpaces;
+ int stripAll;
+ xmlHashTablePtr cdataSection;
+ xsltStackElemPtr variables;
+ xsltTemplatePtr templates;
+ void *templatesHash;
+ void *rootMatch;
+ void *keyMatch;
+ void *elemMatch;
+ void *attrMatch;
+ void *parentMatch;
+ void *textMatch;
+ void *piMatch;
+ void *commentMatch;
+ xmlHashTablePtr nsAliases;
+ xmlHashTablePtr attributeSets;
+ xmlHashTablePtr nsHash;
+ void *nsDefs;
+ void *keys;
+ xmlChar *method;
+ xmlChar *methodURI;
+ xmlChar *version;
+ xmlChar *encoding;
+ int omitXmlDeclaration;
+ xsltDecimalFormatPtr decimalFormat;
+ int standalone;
+ xmlChar *doctypePublic;
+ xmlChar *doctypeSystem;
+ int indent;
+ xmlChar *mediaType;
+ xsltElemPreCompPtr preComps;
+ int warnings;
+ int errors;
+ xmlChar *exclPrefix;
+ xmlChar **exclPrefixTab;
+ int exclPrefixNr;
+ int exclPrefixMax;
+ void *_private;
+ xmlHashTablePtr extInfos;
+ int extrasNr;
+ xsltDocumentPtr includes;
+ xmlDictPtr dict;
+ void *attVTs;
+ const unsigned char *defaultAlias;
+ int nopreproc;
+ int internalized;
+ int literal_result;
+ xsltStylesheetPtr principal;
+ };
+
+ struct _xsltTransformCache {
+ xmlDocPtr RVT;
+ int nbRVT;
+ xsltStackElemPtr stackItems;
+ int nbStackItems;
+ };
+
+ struct _xsltTransformContext {
+ xsltStylesheetPtr style;
+ xsltOutputType type;
+ xsltTemplatePtr templ;
+ int templNr;
+ int templMax;
+ xsltTemplatePtr *templTab;
+ xsltStackElemPtr vars;
+ int varsNr;
+ int varsMax;
+ xsltStackElemPtr *varsTab;
+ int varsBase;
+ xmlHashTablePtr extFunctions;
+ xmlHashTablePtr extElements;
+ xmlHashTablePtr extInfos;
+ const unsigned char *mode;
+ const unsigned char *modeURI;
+ xsltDocumentPtr docList;
+ xsltDocumentPtr document;
+ xmlNode *node;
+ xmlNodeSetPtr nodeList;
+ xmlDocPtr output;
+ xmlNode *insert;
+ xmlXPathContextPtr xpathCtxt;
+ xsltTransformState state;
+ xmlHashTablePtr globalVars;
+ xmlNode *inst;
+ int xinclude;
+ const char *outputFile;
+ int profile;
+ long int prof;
+ int profNr;
+ int profMax;
+ long int *profTab;
+ void *_private;
+ int extrasNr;
+ int extrasMax;
+ xsltRuntimeExtraPtr extras;
+ xsltDocumentPtr styleList;
+ void *sec;
+ xmlGenericErrorFunc error;
+ void *errctx;
+ xsltSortFunc sortfunc;
+ xmlDocPtr tmpRVT;
+ xmlDocPtr persistRVT;
+ int ctxtflags;
+ const unsigned char *lasttext;
+ unsigned int lasttsize;
+ unsigned int lasttuse;
+ int debugStatus;
+ unsigned long int *traceCode;
+ int parserOptions;
+ xmlDictPtr dict;
+ xmlDocPtr tmpDoc;
+ int internalized;
+ int nbKeys;
+ int hasTemplKeyPatterns;
+ xsltTemplatePtr currentTemplateRule;
+ xmlNode *initialContextNode;
+ xmlDocPtr initialContextDoc;
+ xsltTransformCachePtr cache;
+ void *contextVariable;
+ xmlDocPtr localRVT;
+ xmlDocPtr localRVTBase;
+ int keyInitLevel;
+ int funcLevel;
+ };
+
/* Function prototypes */
=== modified file 'headers/libxslt/xsltutils.h'
--- a/headers/libxslt/xsltutils.h 2012-09-07 18:06:08 +0000
+++ b/headers/libxslt/xsltutils.h 2012-09-26 13:53:26 +0000
@@ -7,6 +7,7 @@
#include <libxml2/libxml/tree.h>
#include <libxml2/libxml/xmlerror.h>
#include <libxml2/libxml/dict.h>
+#include <libxml2/libxml/hash.h>
#include <libxml2/libxml/xmlIO.h>
#include <libxml2/libxml/xpath.h>
#include <libxslt/xsltInternals.h>
=== modified file 'package/Makefile'
--- a/package/Makefile 2012-09-20 16:59:58 +0000
+++ b/package/Makefile 2012-09-26 13:53:26 +0000
@@ -46,7 +46,7 @@
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=5
+RPM_PACKAGE_RELEASE=6
# Initialize LIB64 to proper value for 64-bit architectures
export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
More information about the lsb-messages
mailing list