← Back to branch summary

~ubuntu-branches/ubuntu/maverick/libxml2/maverick

« back to all changes in this revision

Viewing changes to xinclude.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-05-18 15:29:30 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070518152930-yo3h40tjup1cn5zj
Tags: 2.6.28.dfsg-1ubuntu1
* Merge with Debian; remaining changes:
  - debian/rules: create a udeb for debian-installer, correct libxml2-dev
    Depends to include zlib1g-dev.
  - Build a python-libxml2-dbg package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
xinclude.c
673
673
    newctxt = xmlXIncludeNewContext(doc);
674
674
    if (newctxt != NULL) {
675
675
        /*
 
676
         * Copy the private user data
 
677
         */
 
678
        newctxt->_private = ctxt->_private;     
 
679
        /*
676
680
         * Copy the existing document set
677
681
         */
678
682
        newctxt->incMax = ctxt->incMax;
1885
1889
                xmlXIncludeErr(ctxt, ctxt->incTab[nr]->ref,
1886
1890
                               XML_XINCLUDE_INVALID_CHAR,
1887
1891
                               "%s contains invalid char\n", URL);
 
1892
                xmlFreeParserInputBuffer(buf);
 
1893
                xmlFree(URL);
 
1894
                return(-1);
1888
1895
            } else {
1889
1896
                xmlNodeAddContentLen(node, &content[i], l);
1890
1897
            }
1930
1937
        newctxt = xmlXIncludeNewContext(ctxt->doc);
1931
1938
        if (newctxt == NULL)
1932
1939
            return (-1);
 
1940
        newctxt->_private = ctxt->_private;
1933
1941
        newctxt->base = xmlStrdup(ctxt->base);  /* Inherit the base from the existing context */
1934
1942
        xmlXIncludeSetFlags(newctxt, ctxt->parseFlags);
1935
1943
        ret = xmlXIncludeDoProcess(newctxt, ctxt->doc, fallback->children);