1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
https://bugs.gentoo.org/919228
--- a/test/xdeltatest.c
+++ b/test/xdeltatest.c
@@ -512,7 +512,7 @@ run_command (TestProfile *tp, int zlevel, int slevel, File* from, File* to, File
if (zlevel > 0 && starts_with (tp->name, "diff"))
{
Patch *patch = read_patch (out, & sbuf);
- gzFile *rewrite = gzopen (out->name, diff_gzargs);
+ gzFile rewrite = gzopen (out->name, diff_gzargs);
if (! rewrite) fail ();
diff --git a/xdelta-1.1.4/xdmain.c b/../../xdelta-1.1.4.new/xdmain.c
index b1abc74..9c27195 100755
--- a/xdmain.c
+++ b/xdmain.c
@@ -179,6 +179,7 @@ struct _XdFileHandle
guint narrow_high;
guint current_pos;
FILE* in;
+ gzFile zin;
gboolean (* in_read) (XdFileHandle* handle, void* buf, gint nbyte);
gboolean (* in_close) (XdFileHandle* handle);
gboolean in_compressed;
@@ -520,7 +521,7 @@ xd_gzwrite (XdFileHandle* fh, const void* buf, gint nbyte)
static gboolean
xd_gzread (XdFileHandle* fh, void* buf, gint nbyte)
{
- return gzread (fh->in, buf, nbyte) == nbyte;
+ return gzread (fh->zin, buf, nbyte) == nbyte;
}
static gboolean
@@ -532,7 +533,7 @@ xd_gzclose (XdFileHandle* fh)
static gboolean
xd_gzrclose (XdFileHandle* fh)
{
- return gzclose (fh->in) == Z_OK;
+ return gzclose (fh->zin) == Z_OK;
}
static void
@@ -1022,13 +1023,13 @@ xd_handle_narrow (XdFileHandle* fh, guint low, guint high, gboolean compressed)
}
g_assert (fh->fd >= 0);
- fh->in = gzdopen (dup (fh->fd), "rb");
+ fh->zin = gzdopen (dup (fh->fd), "rb");
fh->in_read = &xd_gzread;
fh->in_close = &xd_gzrclose;
fh->in_compressed = TRUE;
fh->current_pos = 0;
- if (! fh->in)
+ if (! fh->zin)
{
xd_error ("gzdopen failed: %s\n", g_strerror (errno));
return -1;
|
