projects
/
platform
/
upstream
/
libxml2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.9.5_rc1
[platform/upstream/libxml2.git]
/
xmlIO.c
diff --git
a/xmlIO.c
b/xmlIO.c
index
1a79c09
..
6891ff9
100644
(file)
--- a/
xmlIO.c
+++ b/
xmlIO.c
@@
-926,8
+926,11
@@
xmlFileOpen_real (const char *filename) {
#endif
}
#endif
}
+ /* Do not check DDNAME on zOS ! */
+#if !defined(__MVS__)
if (!xmlCheckFilename(path))
return(NULL);
if (!xmlCheckFilename(path))
return(NULL);
+#endif
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
fd = xmlWrapOpen(path, 0);
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
fd = xmlWrapOpen(path, 0);
@@
-1004,11
+1007,13
@@
xmlFileOpenW (const char *filename) {
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
fd = xmlWrapOpen(path, 1);
#if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
fd = xmlWrapOpen(path, 1);
+#elif(__MVS__)
+ fd = fopen(path, "w");
#else
#else
-
fd = fopen(path, "wb");
+ fd = fopen(path, "wb");
#endif /* WIN32 */
#endif /* WIN32 */
-
if (fd == NULL) xmlIOErr(0, path);
+ if (fd == NULL) xmlIOErr(0, path);
return((void *) fd);
}
#endif /* LIBXML_OUTPUT_ENABLED */
return((void *) fd);
}
#endif /* LIBXML_OUTPUT_ENABLED */
@@
-1286,7
+1291,7
@@
xmlGzfileOpenW (const char *filename, int compression) {
*
* Read @len bytes to @buffer from the compressed I/O channel.
*
*
* Read @len bytes to @buffer from the compressed I/O channel.
*
- * Returns the number of bytes
written
+ * Returns the number of bytes
read.
*/
static int
xmlGzfileRead (void * context, char * buffer, int len) {
*/
static int
xmlGzfileRead (void * context, char * buffer, int len) {
@@
-1674,7
+1679,7
@@
xmlZMemBuffExtend( xmlZMemBuffPtr buff, size_t ext_amt ) {
xmlStrPrintf(msg, 500,
"xmlZMemBuffExtend: %s %lu bytes.\n",
"Allocation failure extending output buffer to",
xmlStrPrintf(msg, 500,
"xmlZMemBuffExtend: %s %lu bytes.\n",
"Allocation failure extending output buffer to",
- new_size );
+
(unsigned long)
new_size );
xmlIOErr(XML_IO_WRITE, (const char *) msg);
}
xmlIOErr(XML_IO_WRITE, (const char *) msg);
}
@@
-1876,7
+1881,7
@@
xmlIOHTTPOpen (const char *filename) {
*/
void *
*/
void *
-xmlIOHTTPOpenW(const char *post_uri, int compression)
+xmlIOHTTPOpenW(const char *post_uri, int compression
ATTRIBUTE_UNUSED
)
{
xmlIOHTTPWriteCtxtPtr ctxt = NULL;
{
xmlIOHTTPWriteCtxtPtr ctxt = NULL;
@@
-3027,7
+3032,7
@@
xmlParserInputBufferCreateMem(const char *mem, int size, xmlCharEncoding enc) {
xmlParserInputBufferPtr ret;
int errcode;
xmlParserInputBufferPtr ret;
int errcode;
- if (size <
=
0) return(NULL);
+ if (size < 0) return(NULL);
if (mem == NULL) return(NULL);
ret = xmlAllocParserInputBuffer(enc);
if (mem == NULL) return(NULL);
ret = xmlAllocParserInputBuffer(enc);
@@
-3063,7
+3068,7
@@
xmlParserInputBufferCreateStatic(const char *mem, int size,
xmlCharEncoding enc) {
xmlParserInputBufferPtr ret;
xmlCharEncoding enc) {
xmlParserInputBufferPtr ret;
- if (size <
=
0) return(NULL);
+ if (size < 0) return(NULL);
if (mem == NULL) return(NULL);
ret = (xmlParserInputBufferPtr) xmlMalloc(sizeof(xmlParserInputBuffer));
if (mem == NULL) return(NULL);
ret = (xmlParserInputBufferPtr) xmlMalloc(sizeof(xmlParserInputBuffer));