summaryrefslogtreecommitdiff
path: root/parser.c
diff options
context:
space:
mode:
authorIgor Zlatkovic <igor@src.gnome.org>2003-02-19 14:51:00 +0000
committerIgor Zlatkovic <igor@src.gnome.org>2003-02-19 14:51:00 +0000
commit5f9fada355da8d4120a526ecea513f85e69755ee (patch)
treed669fb68c1af64f6b059c5011ce5e77a88032756 /parser.c
parentf2238e6e553f0fa039ed084c436b38dbb33a0c86 (diff)
downloadlibxml2-5f9fada355da8d4120a526ecea513f85e69755ee.tar.gz
obsoleted xmlNormalizeWindowsPath
Diffstat (limited to 'parser.c')
-rw-r--r--parser.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/parser.c b/parser.c
index 565265cd..cf509fa7 100644
--- a/parser.c
+++ b/parser.c
@@ -9154,7 +9154,7 @@ xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data,
inputStream->filename = NULL;
else
inputStream->filename = (char *)
- xmlNormalizeWindowsPath((const xmlChar *) filename);
+ xmlCanonicPath((const xmlChar *) filename);
inputStream->buf = buf;
inputStream->base = inputStream->buf->buffer->content;
inputStream->cur = inputStream->buf->buffer->content;
@@ -10330,7 +10330,6 @@ xmlCreateFileParserCtxt(const char *filename)
xmlParserCtxtPtr ctxt;
xmlParserInputPtr inputStream;
char *directory = NULL;
- xmlChar *normalized;
ctxt = xmlNewParserCtxt();
if (ctxt == NULL) {
@@ -10340,26 +10339,18 @@ xmlCreateFileParserCtxt(const char *filename)
return(NULL);
}
- normalized = xmlNormalizeWindowsPath((const xmlChar *) filename);
- if (normalized == NULL) {
- xmlFreeParserCtxt(ctxt);
- return(NULL);
- }
- inputStream = xmlLoadExternalEntity((char *) normalized, NULL, ctxt);
+ inputStream = xmlLoadExternalEntity(filename, NULL, ctxt);
if (inputStream == NULL) {
xmlFreeParserCtxt(ctxt);
- xmlFree(normalized);
return(NULL);
}
inputPush(ctxt, inputStream);
if ((ctxt->directory == NULL) && (directory == NULL))
- directory = xmlParserGetDirectory((char *) normalized);
+ directory = xmlParserGetDirectory(filename);
if ((ctxt->directory == NULL) && (directory != NULL))
ctxt->directory = directory;
- xmlFree(normalized);
-
return(ctxt);
}