commit adf5ec9496828b18e683fb23bd1e670824cfb6d0
author Daniel Veillard <veillard@redhat.com> Thu Jan 26 16:56:22 2012 +0800
committer Daniel Veillard <veillard@redhat.com> Fri Jan 27 22:19:53 2012 +0800
tree da4a0559a396424bb3be76d6ce2284bffdca020e
parent 48a305f522f458b784d312c188178ece16806d21

Cleanups of lzma support

- fix inclusion of the separated file
- use namespaced name for the 4 non-static routines
- add padding after external structures included in-situ
- add new requirement to spec file
- general cleanup of code

xmlIO.c

diff --git a/xmlIO.c b/xmlIO.c
index 4398791..73a995d 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -1315,7 +1315,7 @@
  *		I/O for compressed file accesses			*
  *									*
  ************************************************************************/
-#include "xzlib.c"
+#include "xzlib.h"
 /**
  * xmlXzfileMatch:
  * @filename:  the URI for matching
@@ -1344,7 +1344,7 @@
     xzFile fd;
 
     if (!strcmp(filename, "-")) {
-        fd = xzdopen(dup(0), "rb");
+        fd = __libxml2_xzdopen(dup(0), "rb");
 	return((void *) fd);
     }
 
@@ -1363,7 +1363,7 @@
     if (!xmlCheckFilename(path))
         return(NULL);
 
-    fd = xzopen(path, "rb");
+    fd = __libxml2_xzopen(path, "rb");
     return((void *) fd);
 }
 
@@ -1407,7 +1407,7 @@
 xmlXzfileRead (void * context, char * buffer, int len) {
     int ret;
 
-    ret = xzread((xzFile) context, &buffer[0], len);
+    ret = __libxml2_xzread((xzFile) context, &buffer[0], len);
     if (ret < 0) xmlIOErr(0, "xzread()");
     return(ret);
 }
@@ -1422,7 +1422,7 @@
 xmlXzfileClose (void * context) {
     int ret;
 
-    ret =  (xzclose((xzFile) context) == LZMA_OK ) ? 0 : -1;
+    ret =  (__libxml2_xzclose((xzFile) context) == LZMA_OK ) ? 0 : -1;
     if (ret < 0) xmlIOErr(0, "xzclose()");
     return(ret);
 }