lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-29 15:41:13 +03:00
Code Activity

fixed bug 87230, also multiple make jobs in python directory

Browse Source
This commit is contained in:
William M. Brack
2002-07-21 11:08:24 +00:00
parent 9faf854434
commit 2864c3854e
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun Jul 21 19:10:00 HKT 2002 William Brack <wbrack@mmm.com.hk>
* xsltInternals.h/xslt.c/transform.c and pattern.c: fixed
a bug reported by Gero Meissner (87230)
* fixed a problem compiling python directory when multiple
'make' jobs were executed (python/Makefile.am)
Wed Jul 17 19:58:36 CEST 2002 Daniel Veillard <daniel@veillard.com> Wed Jul 17 19:58:36 CEST 2002 Daniel Veillard <daniel@veillard.com>
* libxslt/attributes.c: fixed a bug reported by Keith Isdale * libxslt/attributes.c: fixed a bug reported by Keith Isdale

4
libxslt/pattern.c
View File

@ -606,7 +606,7 @@ xsltTestCompMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
index = (int) index = (int)
XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra); XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra);
list = (xmlXPathObjectPtr) list = (xmlXPathObjectPtr)
XSLT_RUNTIME_EXTRA(ctxt, select->lenExtra); XSLT_RUNTIME_EXTRA_LST(ctxt, select->lenExtra);
doc = node->doc; doc = node->doc;
if ((list == NULL) || (prevdoc != doc)) { if ((list == NULL) || (prevdoc != doc)) {
@ -644,7 +644,7 @@ xsltTestCompMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
xmlXPathFreeObject(list); xmlXPathFreeObject(list);
list = newlist; list = newlist;
XSLT_RUNTIME_EXTRA(ctxt, select->lenExtra) = XSLT_RUNTIME_EXTRA_LST(ctxt, select->lenExtra) =
(void *) list; (void *) list;
XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra) = XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra) =
(void *) doc; (void *) doc;

1
libxslt/transform.c
View File

@ -263,6 +263,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
for (i = 0;i < cur->extrasMax;i++) { for (i = 0;i < cur->extrasMax;i++) {
cur->extras[i].info = NULL; cur->extras[i].info = NULL;
cur->extras[i].deallocate = NULL; cur->extras[i].deallocate = NULL;
cur->extras[i].val = NULL;
} }
} else { } else {
cur->extras = NULL; cur->extras = NULL;

2
libxslt/xslt.c
View File

@ -397,6 +397,7 @@ xsltAllocateExtraCtxt(xsltTransformContextPtr ctxt)
for (i = 0;i < ctxt->extrasMax;i++) { for (i = 0;i < ctxt->extrasMax;i++) {
ctxt->extras[i].info = NULL; ctxt->extras[i].info = NULL;
ctxt->extras[i].deallocate = NULL; ctxt->extras[i].deallocate = NULL;
ctxt->extras[i].val = NULL;
} }
} else { } else {
@ -415,6 +416,7 @@ xsltAllocateExtraCtxt(xsltTransformContextPtr ctxt)
for (i = ctxt->extrasNr;i < ctxt->extrasMax;i++) { for (i = ctxt->extrasNr;i < ctxt->extrasMax;i++) {
ctxt->extras[i].info = NULL; ctxt->extras[i].info = NULL;
ctxt->extras[i].deallocate = NULL; ctxt->extras[i].deallocate = NULL;
ctxt->extras[i].val = NULL;
} }
} }
} }

9
python/Makefile.am
View File

@ -30,7 +30,7 @@ mylibs = \
$(top_builddir)/libxslt/libxslt.la \ $(top_builddir)/libxslt/libxslt.la \
$(top_builddir)/libexslt/libexslt.la $(top_builddir)/libexslt/libexslt.la
all: libxslt.py libxsltmod.la all-local: libxslt.py
pythondir = $(prefix)/lib/python${PYTHON_VERSION}/site-packages pythondir = $(prefix)/lib/python${PYTHON_VERSION}/site-packages
python_LTLIBRARIES = libxsltmod.la python_LTLIBRARIES = libxsltmod.la
@ -55,8 +55,11 @@ GENERATED= $(srcdir)/libxsltclass.py \
$(srcdir)/libxslt-py.c \ $(srcdir)/libxslt-py.c \
$(srcdir)/libxslt-py.h $(srcdir)/libxslt-py.h
$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC) $(GENERATED): gen_prog
gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
cd $(srcdir) && $(PYTHON) $(GENERATE) cd $(srcdir) && $(PYTHON) $(GENERATE)
touch gen_prog
$(libxsltmod_la_OBJECTS): $(GENERATED) $(libxsltmod_la_OBJECTS): $(GENERATED)
@ -67,5 +70,5 @@ tests test: all
cd tests && $(MAKE) tests cd tests && $(MAKE) tests
clean: clean:
rm -f $(GENERATED) *.o libxslt.so *.pyc libxslt.py rm -f $(GENERATED) *.o libxslt.so *.pyc libxslt.py gen_prog