Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
687c6b1
)
Use a define to handle conflicting function read_buf instead of
author
Wayne Davison
<wayned@samba.org>
Thu, 7 Jul 2005 20:17:35 +0000
(20:17 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 7 Jul 2005 20:17:35 +0000
(20:17 +0000)
renaming it in the code.
zlib/deflate.c
patch
|
blob
|
blame
|
history
diff --git
a/zlib/deflate.c
b/zlib/deflate.c
index
07814c7
..
7f6fd76
100644
(file)
--- a/
zlib/deflate.c
+++ b/
zlib/deflate.c
@@
-51,6
+51,8
@@
#include "deflate.h"
#include "deflate.h"
+#define read_buf dread_buf
+
const char deflate_copyright[] =
" deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly ";
/*
const char deflate_copyright[] =
" deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly ";
/*
@@
-80,7
+82,7
@@
local block_state deflate_slow OF((deflate_state *s, int flush));
local void lm_init OF((deflate_state *s));
local void putShortMSB OF((deflate_state *s, uInt b));
local void flush_pending OF((z_streamp strm));
local void lm_init OF((deflate_state *s));
local void putShortMSB OF((deflate_state *s, uInt b));
local void flush_pending OF((z_streamp strm));
-local int
d
read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
+local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
#ifdef ASMV
void match_init OF((void)); /* asm code initialization */
uInt longest_match OF((deflate_state *s, IPos cur_match));
#ifdef ASMV
void match_init OF((void)); /* asm code initialization */
uInt longest_match OF((deflate_state *s, IPos cur_match));
@@
-411,7
+413,7
@@
local void putShortMSB (s, b)
* Flush as much pending output as possible. All deflate() output goes
* through this function so some applications may wish to modify it
* to avoid allocating a large strm->next_out buffer and copying into it.
* Flush as much pending output as possible. All deflate() output goes
* through this function so some applications may wish to modify it
* to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also
d
read_buf()).
+ * (See also read_buf()).
*/
local void flush_pending(strm)
z_streamp strm;
*/
local void flush_pending(strm)
z_streamp strm;
@@
-659,7
+661,7
@@
int ZEXPORT deflateCopy (dest, source)
* allocating a large strm->next_in buffer and copying from it.
* (See also flush_pending()).
*/
* allocating a large strm->next_in buffer and copying from it.
* (See also flush_pending()).
*/
-local int
d
read_buf(strm, buf, size)
+local int read_buf(strm, buf, size)
z_streamp strm;
Bytef *buf;
unsigned size;
z_streamp strm;
Bytef *buf;
unsigned size;
@@
-1030,7
+1032,7
@@
local void fill_window(s)
*/
Assert(more >= 2, "more < 2");
*/
Assert(more >= 2, "more < 2");
- n =
d
read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+ n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
s->lookahead += n;
/* Initialize the hash value now that we have some input: */
s->lookahead += n;
/* Initialize the hash value now that we have some input: */