GNOME.org
 

Re: [xslt] libxml2-2.6.7/catalog.c -- various inconsistencies

On Wed, 25 Feb 2004, Daniel Veillard wrote:

> On Wed, Feb 25, 2004 at 10:44:34AM +0100, Peter Breitenlohner wrote:
> > 1.6 various typos in the embedded docu
> > ........
> > 2. I think you should handle the generation of xml2Conf.sh in the same way
> > as xsltConf.sh, i.e. via a sed script in the Makefile instead of configure
> > substitutions. Otherwise the resulting xml2Conf.sh may refer to unexpanded
> > variables (e.g. XML2_LIBDIR="-L${libdir}")
>
>   Can you send a patch for the remaining issues. Use diff -c to generate
> a contextual patch.


Hi Daniel,

here is the patch.

I hope I got all the 'catalog reference/ xs. 'catalog local reference' and
'local resource' vs. 'resource' right. Please check.

regards
Peter Breitenlohner <peb@mppmu.mpg.de>
diff -cr libxml2-2.6.7-orig/Makefile.am libxml2-2.6.7/Makefile.am
*** libxml2-2.6.7-orig/Makefile.am	Sun Feb 22 23:14:35 2004
--- libxml2-2.6.7/Makefile.am	Sun Feb 22 23:14:35 2004
***************
*** 901,906 ****
--- 901,915 ----
  ## the value NONE in configure if the user doesn't specify them (this
  ## is an autoconf feature, not a bug).
  
+ xml2Conf.sh: xml2Conf.sh.in Makefile
+ ## Use sed and then mv to avoid problems if the user interrupts.
+ 	sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
+ 	    -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
+ 	    -e 's?\@VERSION\@?$(VERSION)?g' \
+ 	    -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
+ 	       < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
+ 	&& mv xml2Conf.tmp xml2Conf.sh
+ 
  CLEANFILES=xml2Conf.sh
  
  confexecdir=$(libdir)
diff -cr libxml2-2.6.7-orig/catalog.c libxml2-2.6.7/catalog.c
*** libxml2-2.6.7-orig/catalog.c	Sat Nov 15 15:31:22 2003
--- libxml2-2.6.7/catalog.c	Wed Feb 25 13:05:56 2004
***************
*** 392,398 ****
  
  /**
   * xmlFreeCatalog:
!  * @catal:  a Catalog entry
   *
   * Free the memory allocated to a Catalog
   */
--- 392,398 ----
  
  /**
   * xmlFreeCatalog:
!  * @catal:  a Catalog
   *
   * Free the memory allocated to a Catalog
   */
***************
*** 417,423 ****
  #ifdef LIBXML_OUTPUT_ENABLED
  /**
   * xmlCatalogDumpEntry:
!  * @entry:  the 
   * @out:  the file.
   *
   * Serialize an SGML Catalog entry
--- 417,423 ----
  #ifdef LIBXML_OUTPUT_ENABLED
  /**
   * xmlCatalogDumpEntry:
!  * @entry:  the catalog entry
   * @out:  the file.
   *
   * Serialize an SGML Catalog entry
***************
*** 960,966 ****
   *
   * lookup the internal type associated to an XML catalog entry name
   *
!  * Returns the type associate with that name
   */
  static xmlCatalogEntryType
  xmlGetXMLCatalogEntryType(const xmlChar *name) {
--- 960,966 ----
   *
   * lookup the internal type associated to an XML catalog entry name
   *
!  * Returns the type associated with that name
   */
  static xmlCatalogEntryType
  xmlGetXMLCatalogEntryType(const xmlChar *name) {
***************
*** 1469,1476 ****
  /**
   * xmlCatalogXMLResolve:
   * @catal:  a catalog list
!  * @pubId:  the public ID string
!  * @sysId:  the system ID string
   *
   * Do a complete resolution lookup of an External Identifier for a
   * list of catalog entries.
--- 1469,1476 ----
  /**
   * xmlCatalogXMLResolve:
   * @catal:  a catalog list
!  * @pubID:  the public ID string
!  * @sysID:  the system ID string
   *
   * Do a complete resolution lookup of an External Identifier for a
   * list of catalog entries.
***************
*** 1700,1706 ****
   * xmlCatalogXMLResolveURI:
   * @catal:  a catalog list
   * @URI:  the URI
!  * @sysId:  the system ID string
   *
   * Do a complete resolution lookup of an External Identifier for a
   * list of catalog entries.
--- 1700,1706 ----
   * xmlCatalogXMLResolveURI:
   * @catal:  a catalog list
   * @URI:  the URI
!  * @sysID:  the system ID string
   *
   * Do a complete resolution lookup of an External Identifier for a
   * list of catalog entries.
***************
*** 1835,1842 ****
  /**
   * xmlCatalogListXMLResolve:
   * @catal:  a catalog list
!  * @pubId:  the public ID string
!  * @sysId:  the system ID string
   *
   * Do a complete resolution lookup of an External Identifier for a
   * list of catalogs
--- 1835,1842 ----
  /**
   * xmlCatalogListXMLResolve:
   * @catal:  a catalog list
!  * @pubID:  the public ID string
!  * @sysID:  the system ID string
   *
   * Do a complete resolution lookup of an External Identifier for a
   * list of catalogs
***************
*** 2355,2365 ****
  /**
   * xmlCatalogGetSGMLPublic:
   * @catal:  an SGML catalog hash
!  * @pubId:  the public ID string
   *
!  * Try to lookup the system ID associated to a public ID
   *
!  * Returns the system ID if found or NULL otherwise.
   */
  static const xmlChar *
  xmlCatalogGetSGMLPublic(xmlHashTablePtr catal, const xmlChar *pubID) {
--- 2355,2365 ----
  /**
   * xmlCatalogGetSGMLPublic:
   * @catal:  an SGML catalog hash
!  * @pubID:  the public ID string
   *
!  * Try to lookup the catalog local reference associated to a public ID
   *
!  * Returns the local resource if found or NULL otherwise.
   */
  static const xmlChar *
  xmlCatalogGetSGMLPublic(xmlHashTablePtr catal, const xmlChar *pubID) {
***************
*** 2379,2389 ****
  /**
   * xmlCatalogGetSGMLSystem:
   * @catal:  an SGML catalog hash
!  * @sysId:  the public ID string
   *
   * Try to lookup the catalog local reference for a system ID
   *
!  * Returns the system ID if found or NULL otherwise.
   */
  static const xmlChar *
  xmlCatalogGetSGMLSystem(xmlHashTablePtr catal, const xmlChar *sysID) {
--- 2379,2389 ----
  /**
   * xmlCatalogGetSGMLSystem:
   * @catal:  an SGML catalog hash
!  * @sysID:  the system ID string
   *
   * Try to lookup the catalog local reference for a system ID
   *
!  * Returns the local resource if found or NULL otherwise.
   */
  static const xmlChar *
  xmlCatalogGetSGMLSystem(xmlHashTablePtr catal, const xmlChar *sysID) {
***************
*** 2403,2410 ****
  /**
   * xmlCatalogSGMLResolve:
   * @catal:  the SGML catalog
!  * @pubId:  the public ID string
!  * @sysId:  the system ID string
   *
   * Do a complete resolution lookup of an External Identifier
   *
--- 2403,2410 ----
  /**
   * xmlCatalogSGMLResolve:
   * @catal:  the SGML catalog
!  * @pubID:  the public ID string
!  * @sysID:  the system ID string
   *
   * Do a complete resolution lookup of an External Identifier
   *
***************
*** 2576,2586 ****
  /**
   * xmlACatalogResolveSystem:
   * @catal:  a Catalog
!  * @sysID:  the public ID string
   *
   * Try to lookup the catalog resource for a system ID
   *
!  * Returns the system ID if found or NULL otherwise, the value returned
   *      must be freed by the caller.
   */
  xmlChar *
--- 2576,2586 ----
  /**
   * xmlACatalogResolveSystem:
   * @catal:  a Catalog
!  * @sysID:  the system ID string
   *
   * Try to lookup the catalog resource for a system ID
   *
!  * Returns the resource if found or NULL otherwise, the value returned
   *      must be freed by the caller.
   */
  xmlChar *
***************
*** 2613,2621 ****
   * @catal:  a Catalog
   * @pubID:  the public ID string
   *
!  * Try to lookup the system ID associated to a public ID in that catalog
   *
!  * Returns the system ID if found or NULL otherwise, the value returned
   *      must be freed by the caller.
   */
  xmlChar *
--- 2613,2621 ----
   * @catal:  a Catalog
   * @pubID:  the public ID string
   *
!  * Try to lookup the catalog local reference associated to a public ID in that catalog
   *
!  * Returns the local resource if found or NULL otherwise, the value returned
   *      must be freed by the caller.
   */
  xmlChar *
***************
*** 3060,3070 ****
  
  /**
   * xmlCatalogResolveSystem:
!  * @sysID:  the public ID string
   *
   * Try to lookup the catalog resource for a system ID
   *
!  * Returns the system ID if found or NULL otherwise, the value returned
   *      must be freed by the caller.
   */
  xmlChar *
--- 3060,3070 ----
  
  /**
   * xmlCatalogResolveSystem:
!  * @sysID:  the system ID string
   *
   * Try to lookup the catalog resource for a system ID
   *
!  * Returns the resource if found or NULL otherwise, the value returned
   *      must be freed by the caller.
   */
  xmlChar *
***************
*** 3082,3090 ****
   * xmlCatalogResolvePublic:
   * @pubID:  the public ID string
   *
!  * Try to lookup the system ID associated to a public ID
   *
!  * Returns the system ID if found or NULL otherwise, the value returned
   *      must be freed by the caller.
   */
  xmlChar *
--- 3082,3090 ----
   * xmlCatalogResolvePublic:
   * @pubID:  the public ID string
   *
!  * Try to lookup the catalog reference associated to a public ID
   *
!  * Returns the resource if found or NULL otherwise, the value returned
   *      must be freed by the caller.
   */
  xmlChar *
***************
*** 3496,3505 ****
   * xmlCatalogGetSystem:
   * @sysID:  the system ID string
   *
!  * Try to lookup the system ID associated to a public ID
   * DEPRECATED, use xmlCatalogResolveSystem()
   *
!  * Returns the system ID if found or NULL otherwise.
   */
  const xmlChar *
  xmlCatalogGetSystem(const xmlChar *sysID) {
--- 3496,3505 ----
   * xmlCatalogGetSystem:
   * @sysID:  the system ID string
   *
!  * Try to lookup the catalog reference associated to a system ID
   * DEPRECATED, use xmlCatalogResolveSystem()
   *
!  * Returns the resource if found or NULL otherwise.
   */
  const xmlChar *
  xmlCatalogGetSystem(const xmlChar *sysID) {
***************
*** 3540,3549 ****
   * xmlCatalogGetPublic:
   * @pubID:  the public ID string
   *
!  * Try to lookup the system ID associated to a public ID
   * DEPRECATED, use xmlCatalogResolvePublic()
   *
!  * Returns the system ID if found or NULL otherwise.
   */
  const xmlChar *
  xmlCatalogGetPublic(const xmlChar *pubID) {
--- 3540,3549 ----
   * xmlCatalogGetPublic:
   * @pubID:  the public ID string
   *
!  * Try to lookup the catalog reference associated to a public ID
   * DEPRECATED, use xmlCatalogResolvePublic()
   *
!  * Returns the resource if found or NULL otherwise.
   */
  const xmlChar *
  xmlCatalogGetPublic(const xmlChar *pubID) {
diff -cr libxml2-2.6.7-orig/configure.in libxml2-2.6.7/configure.in
*** libxml2-2.6.7-orig/configure.in	Mon Feb 23 17:19:41 2004
--- libxml2-2.6.7/configure.in	Mon Feb 23 17:19:41 2004
***************
*** 1054,1059 ****
  ln -s Copyright COPYING
  
  # keep on one line for cygwin c.f. #130896
! AC_OUTPUT(libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile example/Makefile python/Makefile python/tests/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc xml2Conf.sh python/setup.py)
  
! chmod +x xml2-config xml2Conf.sh python/setup.py
--- 1054,1059 ----
  ln -s Copyright COPYING
  
  # keep on one line for cygwin c.f. #130896
! AC_OUTPUT(libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile example/Makefile python/Makefile python/tests/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py)
  
! chmod +x xml2-config python/setup.py
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]