← Back to branch summary

~ubuntu-branches/ubuntu/wily/libxml2/wily-proposed

« back to all changes in this revision

Viewing changes to catalog.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-07-11 09:31:50 UTC
  • mfrom: (43.2.4 sid)
  • Revision ID: package-import@ubuntu.com-20130711093150-t3vcnrpfqepqt0mp
Tags: 2.9.1+dfsg1-2ubuntu1
* Merged from Debian unstable. Remaining changes:
  - Fix python multi-arch includes issues. 
  - Allow the package to cross-build.
  - Set PYTHON_LIBS for cross builds.
  - Remove explicit build dependency on binutils.
  - Configure the udeb --without-python.
* Dropped patches:
  - CVE-2013-0338.patch: upstream
  - CVE-2013-1969.patch: upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
catalog.c
84
84
#define GetModuleHandleA GetModuleHandle
85
85
#define GetModuleFileNameA GetModuleFileName
86
86
#else
 
87
#if !defined(_WINDOWS_)
87
88
void* __stdcall GetModuleHandleA(const char*);
88
89
unsigned long __stdcall GetModuleFileNameA(void*, char*, unsigned long);
89
90
#endif
90
91
#endif
 
92
#endif
91
93
 
92
94
static xmlChar *xmlCatalogNormalizePublic(const xmlChar *pubID);
93
95
static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
989
991
        return (NULL);
990
992
    }
991
993
#endif
992
 
    content = xmlMallocAtomic(size + 10);
 
994
    content = (xmlChar*)xmlMallocAtomic(size + 10);
993
995
    if (content == NULL) {
994
996
        xmlCatalogErrMemory("allocating catalog data");
995
997
        return (NULL);
1547
1549
                                       NULL, catal->prefer, NULL);
1548
1550
    if (doregister) {
1549
1551
        catal->type = XML_CATA_CATALOG;
1550
 
        cur = xmlHashLookup(xmlCatalogXMLFiles, catal->URL);
 
1552
        cur = (xmlCatalogEntryPtr)xmlHashLookup(xmlCatalogXMLFiles, catal->URL);
1551
1553
        if (cur != NULL)
1552
1554
            cur->children = catal->children;
1553
1555
    }
3129
3131
                                if (p != buf) {
3130
3132
                                        xmlChar* uri;
3131
3133
                                        strncpy(p, "\\..\\etc\\catalog", 255 - (p - buf));
3132
 
                                        uri = xmlCanonicPath(buf);
 
3134
                                        uri = xmlCanonicPath((const xmlChar*)buf);
3133
3135
                                        if (uri != NULL) {
3134
3136
                                                strncpy(XML_XML_DEFAULT_CATALOG, uri, 255);
3135
3137
                                                xmlFree(uri);
3244
3246
                cur++;
3245
3247
            path = xmlStrndup((const xmlChar *)paths, cur - paths);
3246
3248
#ifdef _WIN32
3247
 
        iLen = strlen(path);
 
3249
        iLen = strlen((const char*)path);
3248
3250
        for(i = 0; i < iLen; i++) {
3249
3251
            if(path[i] == '\\') {
3250
3252
                path[i] = '/';