diff --git a/ChangeLog b/ChangeLog index 553e61cb..7b7b662e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sat Nov 10 14:01:44 CET 2001 Daniel Veillard + + * configure.in: preparing 1.0.7 + * libxslt.spec.in: cleanup similar to libxml2 one + * breakpoint/*.[hc]: finished cleaning up contributed code + * doc/*: updated and rebuilt the documentation + * xsltproc/xsltproc.c: cleanup of the timing code + * xsltproc/Makefile.am: auto* sucks + * libxslt/transform.c: added a missing include + Mon Nov 5 14:29:26 CET 2001 Daniel Veillard * Makefile.am acconfig.h config.h.in configure.in diff --git a/breakpoint/breakpoint.h b/breakpoint/breakpoint.h index 4c6f1703..9af664f9 100644 --- a/breakpoint/breakpoint.h +++ b/breakpoint/breakpoint.h @@ -23,6 +23,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* Define the types of status whilst debugging*/ typedef enum { DEBUG_NONE, /* no debugging allowed */ @@ -62,7 +66,7 @@ struct _xslBreakPoint { ----------------------------------------------------------- Break point related functions ---------------------------------------------------------- -* +*/ /** * xslFindTemplateNode: @@ -81,7 +85,7 @@ xmlNodePtr xslFindTemplateNode(const xsltStylesheetPtr style, * * Return the break point number that we stoped at */ -int xslActiveBreakPoint(); +int xslActiveBreakPoint(void); /** @@ -188,7 +192,7 @@ int xslIsBreakPointEnabled(int breakPointNumber); * * Returns the number of break points present */ -int xslBreakPointCount(); +int xslBreakPointCount(void); /** @@ -261,7 +265,7 @@ void xslDebugBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, * * Initialize debugger allocating any memory needed by debugger */ -void xslDebugInit(); +void xslDebugInit(void); /** @@ -269,7 +273,7 @@ void xslDebugInit(); * * Free up any memory taken by debugger */ -void xslDebugFree(); +void xslDebugFree(void); /** @@ -337,7 +341,7 @@ int xslAddCall(xsltTemplatePtr templ, xmlNodePtr source); * * Drop the topmost item off the call stack */ -void xslDropCall(); +void xslDropCall(void); /** @@ -379,7 +383,7 @@ xslCallPointPtr xslGetCall(int depth); * * Returns the top of the call stack */ -xslCallPointPtr xslGetCallStackTop(); +xslCallPointPtr xslGetCallStackTop(void); /** @@ -387,10 +391,13 @@ xslCallPointPtr xslGetCallStackTop(); * * Returns the depth of call stack */ -int xslCallDepth(); +int xslCallDepth(void); +#ifdef __cplusplus +} +#endif #endif diff --git a/breakpoint/dbgbreakpoint.c b/breakpoint/dbgbreakpoint.c index c2bc2336..0f46d56a 100644 --- a/breakpoint/dbgbreakpoint.c +++ b/breakpoint/dbgbreakpoint.c @@ -43,7 +43,7 @@ xslActiveBreakPoint() * 0 otherwise */ int -xslSetActiveBreakPoint(int breakPointNumber) +xslSetActiveBreakPoint(int breakPointNumber ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslSetActiveBreakPoint' not overloaded\n"); @@ -66,8 +66,8 @@ xslSetActiveBreakPoint(int breakPointNumber) * 0 otherwise */ int -xslAddBreakPoint(const xmlChar * url, long lineNumber, - const xmlChar * templateName, int type) +xslAddBreakPoint(const xmlChar * url ATTRIBUTE_UNUSED, long lineNumber ATTRIBUTE_UNUSED, + const xmlChar * templateName ATTRIBUTE_UNUSED, int type ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, @@ -85,7 +85,7 @@ xslAddBreakPoint(const xmlChar * url, long lineNumber, * 0 otherwise */ int -xslDeleteBreakPoint(int breakPointNumber) +xslDeleteBreakPoint(int breakPointNumber ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, @@ -107,7 +107,7 @@ xslDeleteBreakPoint(int breakPointNumber) * 0 otherwise */ int -xslEnableBreakPoint(int breakPointNumber, int enable) +xslEnableBreakPoint(int breakPointNumber ATTRIBUTE_UNUSED, int enable ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslEnableBreakPoint' not overloaded\n"); @@ -126,7 +126,7 @@ xslEnableBreakPoint(int breakPointNumber, int enable) * 1 if break point is enabled */ int -xslIsBreakPointEnabled(int breakPointNumber) +xslIsBreakPointEnabled(int breakPointNumber ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslIsBreakPointEnabled' not overloaded\n"); @@ -155,7 +155,7 @@ xslBreakPointCount() * NULL otherwise */ xslBreakPointPtr -xslGetBreakPoint(int breakPointNumber) +xslGetBreakPoint(int breakPointNumber ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslGetBreakPoint' not overloaded\n"); @@ -174,7 +174,7 @@ xslGetBreakPoint(int breakPointNumber) * 0 otherwise */ int -xslPrintBreakPoint(FILE * file, int breakPointNumber) +xslPrintBreakPoint(FILE * file ATTRIBUTE_UNUSED, int breakPointNumber ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslPrintBreakPoint' not overloaded\n"); @@ -194,7 +194,7 @@ xslPrintBreakPoint(FILE * file, int breakPointNumber) * 0 otherwise */ int -xslIsBreakPoint(const xmlChar * url, long lineNumber) +xslIsBreakPoint(const xmlChar * url ATTRIBUTE_UNUSED, long lineNumber ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslIsBreakPoint' not overloaded\n"); @@ -212,7 +212,7 @@ xslIsBreakPoint(const xmlChar * url, long lineNumber) * 0 otherwise */ int -xslIsBreakPointNode(xmlNodePtr node) +xslIsBreakPointNode(xmlNodePtr node ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslIsBreakPointNode' not overloaded\n"); diff --git a/breakpoint/dbgcallstack.c b/breakpoint/dbgcallstack.c index 778a14e3..4831d0d4 100644 --- a/breakpoint/dbgcallstack.c +++ b/breakpoint/dbgcallstack.c @@ -17,6 +17,7 @@ ----------------------------------------------------- */ +#include "libxslt.h" #include "xsltutils.h" #include "breakpoint.h" @@ -29,7 +30,8 @@ * Returns a reference to the added info if sucessfull, otherwise NULL */ xslCallPointInfoPtr -xslAddCallInfo(const xmlChar * templateName, const xmlChar * url) +xslAddCallInfo(const xmlChar * templateName ATTRIBUTE_UNUSED, + const xmlChar * url ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslAddCallInfo' not overloaded\n"); @@ -47,7 +49,7 @@ xslAddCallInfo(const xmlChar * templateName, const xmlChar * url) * Returns : 1 on sucess, 0 otherwise */ int -xslAddCall(xsltTemplatePtr templ, xmlNodePtr source) +xslAddCall(xsltTemplatePtr templ ATTRIBUTE_UNUSED, xmlNodePtr source ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslAddCall' not overloaded\n"); @@ -62,7 +64,7 @@ xslAddCall(xsltTemplatePtr templ, xmlNodePtr source) * Drop the topmost item off the call stack */ void -xslDropCall() +xslDropCall(void) { xsltGenericError(xsltGenericErrorContext, @@ -79,7 +81,7 @@ xslDropCall() * Returns 1 on sucess , 0 otherwise */ int -xslStepupToDepth(int depth) +xslStepupToDepth(int depth ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslStepupToDepth' not overloaded\n"); @@ -95,7 +97,7 @@ xslStepupToDepth(int depth) * Returns 1 on sucess , 0 otherwise */ int -xslStepdownToDepth(int depth) +xslStepdownToDepth(int depth ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslStepdownToDepth' not overloaded\n"); @@ -113,7 +115,7 @@ xslStepdownToDepth(int depth) * NULL otherwise */ xslCallPointPtr -xslGetCall(int depth) +xslGetCall(int depth ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslGetCall' not overloaded\n"); @@ -128,7 +130,7 @@ xslGetCall(int depth) * Returns the top of the call stack */ xslCallPointPtr -xslGetCallStackTop() +xslGetCallStackTop(void) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslGetCallStackTop' not overloaded\n"); @@ -143,7 +145,7 @@ xslGetCallStackTop() * Return the depth of call stack */ int -xslCallDepth() +xslCallDepth(void) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslCallDepth' not overloaded\n"); diff --git a/breakpoint/dbgmain.c b/breakpoint/dbgmain.c index e1efda75..1356a466 100644 --- a/breakpoint/dbgmain.c +++ b/breakpoint/dbgmain.c @@ -52,6 +52,7 @@ xslDebugFree() extern char *xslShellReadline(char *prompt); + /** * @templ : The source node being executed * @node : The data node being processed @@ -61,8 +62,10 @@ extern char *xslShellReadline(char *prompt); * A break point has been found so pass control to user */ void -xslDebugBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, - xsltTransformContextPtr ctxt) +xslDebugBreak(xmlNodePtr templ ATTRIBUTE_UNUSED, + xmlNodePtr node ATTRIBUTE_UNUSED, + xsltTemplatePtr root ATTRIBUTE_UNUSED, + xsltTransformContextPtr ctxt ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslDebugBreak' not overloaded\n"); diff --git a/breakpoint/dbgsearch.c b/breakpoint/dbgsearch.c index 3d911499..1d3fb785 100644 --- a/breakpoint/dbgsearch.c +++ b/breakpoint/dbgsearch.c @@ -30,7 +30,8 @@ * NULL otherwise */ xmlNodePtr -xslFindTemplateNode(xsltStylesheetPtr style, const xmlChar * name) +xslFindTemplateNode(xsltStylesheetPtr style ATTRIBUTE_UNUSED, + const xmlChar * name ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, @@ -51,8 +52,9 @@ xslFindTemplateNode(xsltStylesheetPtr style, const xmlChar * name) * 0 otherwise */ xmlNodePtr -xslFindNodeByLineNo(xsltTransformContextPtr ctxt, - const xmlChar * url, long lineNumber) +xslFindNodeByLineNo(xsltTransformContextPtr ctxt ATTRIBUTE_UNUSED, + const xmlChar * url ATTRIBUTE_UNUSED, + long lineNumber ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslFindNodeByLineNo' not overloaded\n"); @@ -70,7 +72,7 @@ xslFindNodeByLineNo(xsltTransformContextPtr ctxt, * 0 otherwise */ int -xslFindBreakPointById(int id) +xslFindBreakPointById(int id ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslFindBreakPointById' not overloaded\n"); @@ -89,7 +91,8 @@ xslFindBreakPointById(int id) * 0 otherwise */ int -xslFindBreakPointByLineNo(const xmlChar * url, long lineNumber) +xslFindBreakPointByLineNo(const xmlChar * url ATTRIBUTE_UNUSED, + long lineNumber ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslFindBreakPointByLineNo' not overloaded\n"); @@ -108,7 +111,7 @@ xslFindBreakPointByLineNo(const xmlChar * url, long lineNumber) * 0 otherwise */ int -xslFindBreakPointByName(const xmlChar * templateName) +xslFindBreakPointByName(const xmlChar * templateName ATTRIBUTE_UNUSED) { xsltGenericError(xsltGenericErrorContext, "Error!: Debugger function 'xslFindBreakPointByName' not overloaded\n"); diff --git a/config.h.in b/config.h.in index 08af5633..ce889f73 100644 --- a/config.h.in +++ b/config.h.in @@ -55,6 +55,9 @@ /* Define if you have the header file. */ #undef HAVE_NAN_H +/* Define if you have the header file. */ +#undef HAVE_STDARG_H + /* Define if you have the header file. */ #undef HAVE_STDLIB_H diff --git a/configure.in b/configure.in index 7dddf069..208fb701 100644 --- a/configure.in +++ b/configure.in @@ -78,7 +78,7 @@ dnl AC_CHECK_HEADERS(sys/types.h sys/time.h stdlib.h unistd.h string.h) AC_CHECK_HEADERS(ieeefp.h nan.h math.h fp_class.h float.h ansidecl.h) -AC_CHECK_HEADERS(time.h sys/stat.h) +AC_CHECK_HEADERS(time.h sys/stat.h stdarg.h) AC_CHECK_FUNCS(stat _stat) AC_CHECK_FUNC(isnan, , AC_CHECK_LIB(m, isnan, diff --git a/doc/downloads.html b/doc/downloads.html index bdc3a44f..d2ff660d 100644 --- a/doc/downloads.html +++ b/doc/downloads.html @@ -74,9 +74,15 @@ platform, get in touch with me to upload the package. I will keep them in the contrib directory

Libxslt is also available from CVS:

-

Daniel Veillard

diff --git a/doc/html/libxslt-attributes.html b/doc/html/libxslt-attributes.html index f9b6aa54..38e9f052 100644 --- a/doc/html/libxslt-attributes.html +++ b/doc/html/libxslt-attributes.html @@ -123,7 +123,7 @@ NAME="LIBXSLT-ATTRIBUTES" >

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

(xsltTransformContextPtr ctxt); +void xslHandleDebugger (xmlNodePtr cur, + xmlNodePtr node, + xsltTemplatePtr templ, + xsltTransformContextPtr ctxt);

Description

Details

xslHandleDebugger ()

void        xslHandleDebugger               (xmlNodePtr cur,
+                                             xmlNodePtr node,
+                                             xsltTemplatePtr templ,
+                                             xsltTransformContextPtr ctxt);

If either cur or node are a breakpoint, or xslDebugStatus in state +where debugging must occcur at this time then transfer control +to the xslDebugBreak function

cur : source node being executed
node : data node being processed
templ : temlate that applies to node
ctxt : the xslt transform context

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

CVS only : check the Changelog file for a really accurate description

+

1.0.7: Nov 10 2001

+
    +
  • remove a compilation problem with LIBXSLT_PUBLIC
    • +
  • Finishing the integration steps for Keith Isdale debugger
    • +
  • fixes the handling of indent="no" on HTML output
    • +
  • fixes on the configure script and RPM spec file
    • +

1.0.6: Oct 30 2001

  • bug fixes on number formatting (Thomas), date/time functions (Bruce diff --git a/doc/xslt.html b/doc/xslt.html index 9d043ba4..3723dbf8 100644 --- a/doc/xslt.html +++ b/doc/xslt.html @@ -187,6 +187,10 @@ platform, get in touch with me to upload the package. I will keep them in the href="http://developer.gnome.org/tools/cvs.html">Gnome CVS Tools page; the CVS module is libxslt.

    • +
  • daily + snapshots from CVS + are also provided

News

@@ -195,6 +199,14 @@ platform, get in touch with me to upload the package. I will keep them in the href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog file for a really accurate description +

1.0.7: Nov 10 2001

+
    +
  • remove a compilation problem with LIBXSLT_PUBLIC
    • +
  • Finishing the integration steps for Keith Isdale debugger
    • +
  • fixes the handling of indent="no" on HTML output
    • +
  • fixes on the configure script and RPM spec file
    • +
+

1.0.6: Oct 30 2001

  • bug fixes on number formatting (Thomas), date/time functions (Bruce diff --git a/libxslt.spec.in b/libxslt.spec.in index d52287c7..f47be8a7 100644 --- a/libxslt.spec.in +++ b/libxslt.spec.in @@ -1,21 +1,16 @@ -# Note that this is NOT a relocatable package -%define ver @VERSION@ -%define prefix /usr -%define datadir %{prefix}/share - Summary: Library providing the Gnome XSLT engine Name: libxslt -Version: %ver +Version: @VERSION@ Release: 1 Copyright: LGPL Group: Development/Libraries -Source: ftp://xmlsoft.org/XSLT/libxslt-%{ver}.tar.gz -BuildRoot: /var/tmp/libxslt-%{PACKAGE_VERSION}-root +Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://xmlsoft.org/XSLT/ Requires: libxml2 >= @LIBXML_REQUIRED_VERSION@ BuildRequires: libxml2-devel >= @LIBXML_REQUIRED_VERSION@ - -URL: http://xmlsoft.org/XSLT/ -Docdir: %{prefix}/doc +Prefix: %{_prefix} +Docdir: %{_docdir} %description This C library allows to transform XML files into other XML files @@ -27,7 +22,7 @@ installed. The xsltproc command is a command line interface to the XSLT engine Summary: Libraries, includes, etc. to embed the Gnome XSLT engine Group: Development/Libraries Requires: libxslt = %{version} -Requires: libxml2-devel >= 2.3.10 +Requires: libxml2-devel >= @LIBXML_REQUIRED_VERSION@ %description devel This C library allows to transform XML files into other XML files @@ -35,28 +30,22 @@ This C library allows to transform XML files into other XML files mechanism. To use it you need to have a version of libxml2 >= 2.3.8 installed. -%changelog - -* Mon Jan 22 2001 Daniel.Veillard - -- created based on libxml2 spec file - %prep -%setup +%setup -q %build # Needed for snapshot releases. if [ ! -f configure ]; then %ifarch alpha - CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" + CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} %else - CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --sysconfdir="/etc" + CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} %endif else %ifarch alpha - CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" + CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} %else - CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" + CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir="/etc" --mandir=%{_mandir} %endif fi @@ -70,9 +59,9 @@ fi %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{datadir}/man/man1 -install -d $RPM_BUILD_ROOT%{datadir}/man/man4 -make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{datadir}/man install +install -d $RPM_BUILD_ROOT%{_mandir}/man1 +install -d $RPM_BUILD_ROOT%{_mandir}/man4 +make prefix=$RPM_BUILD_ROOT%{prefix} mandir=$RPM_BUILD_ROOT%{_mandir} install %clean rm -rf $RPM_BUILD_ROOT @@ -86,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO FEATURES %doc doc/*.html doc/html doc/tutorial -%doc %{prefix}/share/man/man1/xsltproc.1* +%doc %{_mandir}/man1/xsltproc.1* %{prefix}/lib/lib*.so.* %{prefix}/bin/xsltproc @@ -99,3 +88,14 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/lib/*.sh %{prefix}/include/* %{prefix}/bin/xslt-config + +%changelog + +* Sat Nov 10 2001 Daniel.Veillard + +- cleaned up the specfile + +* Mon Jan 22 2001 Daniel.Veillard + +- created based on libxml2 spec file + diff --git a/libxslt/transform.c b/libxslt/transform.c index 0d2fbd27..168c8d66 100644 --- a/libxslt/transform.c +++ b/libxslt/transform.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include "xslt.h" #include "xsltInternals.h" diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index 919bf8bc..0f69a524 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -9,11 +9,11 @@ if DV_STATIC_LINK all: xsltproc if WITH_DEBUGGER -xsltproc: xsltproc.o ../libxslt/.libs/libxslt.a ../libexslt/.libs/libexslt.a ../breakpoint/.libs/libxsltbreakpoint.a ../../XML/.libs/libxml2.a - gcc -g -O -o xsltproc xsltproc.o ../libxslt/.libs/libxslt.a ../breakpoint/.libs/libxsltbreakpoint.a ../libexslt/.libs/libexslt.a ../../XML/.libs/libxml2.a -lz -lm +xsltproc$(EXEEXT): xsltproc.o ../libxslt/.libs/libxslt.a ../libexslt/.libs/libexslt.a ../breakpoint/.libs/libxsltbreakpoint.a ../../XML/.libs/libxml2.a + gcc -g -O -o xsltproc$(EXEEXT) xsltproc.o ../libxslt/.libs/libxslt.a ../breakpoint/.libs/libxsltbreakpoint.a ../libexslt/.libs/libexslt.a ../../XML/.libs/libxml2.a -lz -lm else -xsltproc: xsltproc.o ../libxslt/.libs/libxslt.a ../libexslt/.libs/libexslt.a ../../XML/.libs/libxml2.a - gcc -g -O -o xsltproc xsltproc.o ../libxslt/.libs/libxslt.a ../libexslt/.libs/libexslt.a ../../XML/.libs/libxml2.a -lz -lm +xsltproc$(EXEEXT): xsltproc.o ../libxslt/.libs/libxslt.a ../libexslt/.libs/libexslt.a ../../XML/.libs/libxml2.a + gcc -g -O -o xsltproc$(EXEEXT) xsltproc.o ../libxslt/.libs/libxslt.a ../libexslt/.libs/libexslt.a ../../XML/.libs/libxml2.a -lz -lm endif programs= diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index e4da623e..cdc9e1ea 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -23,6 +23,9 @@ #ifdef HAVE_STDLIB_H #include #endif +#ifdef HAVE_STDARG_H +#include +#endif #include #include #include @@ -53,7 +56,11 @@ #define gettimeofday(p1,p2) #endif /* _MS_VER */ #else /* WIN32 */ +#if defined(HAVE_SYS_TIME_H) #include +#elif defined(HAVE_TIME_H) +#include +#endif #endif /* WIN32 */ #ifndef HAVE_STAT @@ -87,11 +94,104 @@ static int xinclude = 0; #endif static int profile = 0; -static struct timeval begin, end; static const char *params[16 + 1]; static int nbparams = 0; static const char *output = NULL; +/* + * Internal timing routines to remove the necessity to have unix-specific + * function calls + */ + +#if defined(HAVE_GETTIMEOFDAY) +static struct timeval begin, end; +/* + * startTimer: call where you want to start timing + */ +static void startTimer(void) +{ + gettimeofday(&begin,NULL); +} +/* + * endTimer: call where you want to stop timing and to print out a + * message about the timing performed; format is a printf + * type argument + */ +static void endTimer(const char *format, ...) +{ + long msec; + va_list ap; + + gettimeofday(&end, NULL); + msec = end.tv_sec - begin.tv_sec; + msec *= 1000; + msec += (end.tv_usec - begin.tv_usec) / 1000; + +#ifndef HAVE_STDARG_H +#error "endTimer required stdarg functions" +#endif + va_start(ap, format); + vfprintf(stderr,format,ap); + va_end(ap); + + fprintf(stderr, " took %ld ms\n", msec); +} +#elif defined(HAVE_TIME_H) +/* + * No gettimeofday function, so we have to make do with calling clock. + * This is obviously less accurate, but there's little we can do about + * that. + */ + +clock_t begin, end; +static void startTimer(void) +{ + begin=clock(); +} +static void endTimer(char *format, ...) +{ + long msec; + va_list ap; + + end=clock(); + msec = ((end-begin) * 1000) / CLOCKS_PER_SEC; + +#ifndef HAVE_STDARG_H +#error "endTimer required stdarg functions" +#endif + va_start(ap, format); + vfprintf(stderr,format,ap); + va_end(ap); + fprintf(stderr, " took %ld ms\n", msec); +} +#else +/* + * We don't have a gettimeofday or time.h, so we just don't do timing + */ +static void startTimer(void) +{ + /* + * Do nothing + */ +} +static void endTimer(char *format, ...) +{ + /* + * We cannot do anything because we don't have a timing function + */ +#ifdef HAVE_STDARG_H + va_start(ap, format); + vfprintf(stderr,format,ap); + va_end(ap); + fprintf(stderr, " was not timed\n", msec); +#else + /* We don't have gettimeofday, time or stdarg.h, what crazy world is + * this ?! + */ +#endif +} +#endif + static void xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) { xmlDocPtr res; @@ -99,22 +199,15 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) { #ifdef LIBXML_XINCLUDE_ENABLED if (xinclude) { if (timing) - gettimeofday(&begin, NULL); + startTimer(); xmlXIncludeProcess(doc); if (timing) { - long msec; - - gettimeofday(&end, NULL); - msec = end.tv_sec - begin.tv_sec; - msec *= 1000; - msec += (end.tv_usec - begin.tv_usec) / 1000; - fprintf(stderr, "XInclude processing %s took %ld ms\n", - filename, msec); + endTimer("XInclude processing %s", filename); } } #endif if (timing) - gettimeofday(&begin, NULL); + startTimer(); if (output == NULL) { if (repeat) { int j; @@ -142,19 +235,10 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) { res = xsltApplyStylesheet(cur, doc, params); } if (timing) { - long msec; - - gettimeofday(&end, NULL); - msec = end.tv_sec - begin.tv_sec; - msec *= 1000; - msec += (end.tv_usec - begin.tv_usec) / 1000; if (repeat) - fprintf(stderr, - "Applying stylesheet %d times took %ld ms\n", - repeat, msec); + endTimer("Applying stylesheet %d times", repeat); else - fprintf(stderr, - "Applying stylesheet took %ld ms\n", msec); + endTimer("Applying stylesheet"); } xmlFreeDoc(doc); if (res == NULL) { @@ -172,37 +256,19 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) { #endif if (cur->methodURI == NULL) { if (timing) - gettimeofday(&begin, NULL); + startTimer(); xsltSaveResultToFile(stdout, res, cur); - if (timing) { - long msec; - - gettimeofday(&end, NULL); - msec = end.tv_sec - begin.tv_sec; - msec *= 1000; - msec += (end.tv_usec - begin.tv_usec) / 1000; - fprintf(stderr, "Saving result took %ld ms\n", - msec); - } + if (timing) + endTimer("Saving result"); } else { if (xmlStrEqual (cur->method, (const xmlChar *) "xhtml")) { fprintf(stderr, "non standard output xhtml\n"); if (timing) - gettimeofday(&begin, NULL); + startTimer(); xsltSaveResultToFile(stdout, res, cur); - if (timing) { - long msec; - - gettimeofday(&end, NULL); - msec = end.tv_sec - begin.tv_sec; - msec *= 1000; - msec += - (end.tv_usec - begin.tv_usec) / 1000; - fprintf(stderr, - "Saving result took %ld ms\n", - msec); - } + if (timing) + endTimer("Saving result"); } else { fprintf(stderr, "Unsupported non standard output %s\n", @@ -216,17 +282,8 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) { xmlFreeDoc(res); } else { xsltRunStylesheet(cur, doc, params, output, NULL, NULL); - if (timing) { - long msec; - - gettimeofday(&end, NULL); - msec = end.tv_sec - begin.tv_sec; - msec *= 1000; - msec += (end.tv_usec - begin.tv_usec) / 1000; - fprintf(stderr, - "Running stylesheet and saving result took %ld ms\n", - msec); - } + if (timing) + endTimer("Running stylesheet and saving result"); xmlFreeDoc(doc); } } @@ -421,18 +478,10 @@ main(int argc, char **argv) } if ((argv[i][0] != '-') || (strcmp(argv[i], "-") == 0)) { if (timing) - gettimeofday(&begin, NULL); + startTimer(); style = xmlParseFile((const char *) argv[i]); - if (timing) { - long msec; - - gettimeofday(&end, NULL); - msec = end.tv_sec - begin.tv_sec; - msec *= 1000; - msec += (end.tv_usec - begin.tv_usec) / 1000; - fprintf(stderr, "Parsing stylesheet %s took %ld ms\n", - argv[i], msec); - } + if (timing) + endTimer("Parsing stylesheet %s", argv[i]); if (style == NULL) { fprintf(stderr, "cannot parse %s\n", argv[i]); cur = NULL; @@ -471,7 +520,7 @@ main(int argc, char **argv) for (; i < argc; i++) { doc = NULL; if (timing) - gettimeofday(&begin, NULL); + startTimer(); #ifdef LIBXML_HTML_ENABLED if (html) doc = htmlParseFile(argv[i], NULL); @@ -487,16 +536,8 @@ main(int argc, char **argv) fprintf(stderr, "unable to parse %s\n", argv[i]); continue; } - if (timing) { - long msec; - - gettimeofday(&end, NULL); - msec = end.tv_sec - begin.tv_sec; - msec *= 1000; - msec += (end.tv_usec - begin.tv_usec) / 1000; - fprintf(stderr, "Parsing document %s took %ld ms\n", - argv[i], msec); - } + if (timing) + endTimer("Parsing document %s", argv[i]); xsltProcess(doc, cur, argv[i]); } }