summaryrefslogtreecommitdiff
path: root/rsync
authorschurig <schurig>2004-09-10 12:48:25 (UTC)
committer schurig <schurig>2004-09-10 12:48:25 (UTC)
commitf9fb882141b4a519ae958e6332fb5a8ef717d88c (patch) (unidiff)
treea97e359f73a0afc98d4a58ba057676cf8da94f13 /rsync
parent85928a3781d9a91b58ea414c0d7982459cc21920 (diff)
downloadopie-f9fb882141b4a519ae958e6332fb5a8ef717d88c.zip
opie-f9fb882141b4a519ae958e6332fb5a8ef717d88c.tar.gz
opie-f9fb882141b4a519ae958e6332fb5a8ef717d88c.tar.bz2
In old ANSI-C you can't have expressions before variable declarations
(C++ allows this)
Diffstat (limited to 'rsync') (more/less context) (ignore whitespace changes)
-rw-r--r--rsync/buf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/rsync/buf.c b/rsync/buf.c
index c978fff..fdd67ee 100644
--- a/rsync/buf.c
+++ b/rsync/buf.c
@@ -93,16 +93,17 @@ void rs_filebuf_free(rs_filebuf_t *fb)
93 * BUF, and let the stream use that. On return, SEEN_EOF is true if 93 * BUF, and let the stream use that. On return, SEEN_EOF is true if
94 * the end of file has passed into the stream. 94 * the end of file has passed into the stream.
95 */ 95 */
96rs_result rs_infilebuf_fill(rs_job_t *job, rs_buffers_t *buf, 96rs_result rs_infilebuf_fill(rs_job_t *job, rs_buffers_t *buf,
97 void *opaque) 97 void *opaque)
98{ 98{
99 job=job;
100 int len; 99 int len;
101 rs_filebuf_t *fb = (rs_filebuf_t *) opaque; 100 rs_filebuf_t *fb = (rs_filebuf_t *) opaque;
102 FILE *f = fb->f; 101 FILE *f = fb->f;
102
103 job=job; // fix unused warning
103 104
104 /* This is only allowed if either the buf has no input buffer 105 /* This is only allowed if either the buf has no input buffer
105 * yet, or that buffer could possibly be BUF. */ 106 * yet, or that buffer could possibly be BUF. */
106 if (buf->next_in != NULL) { 107 if (buf->next_in != NULL) {
107 assert(buf->avail_in <= fb->buf_len); 108 assert(buf->avail_in <= fb->buf_len);
108 assert(buf->next_in >= fb->buf); 109 assert(buf->next_in >= fb->buf);
@@ -145,17 +146,18 @@ rs_result rs_infilebuf_fill(rs_job_t *job, rs_buffers_t *buf,
145 * The buf is already using BUF for an output buffer, and probably 146 * The buf is already using BUF for an output buffer, and probably
146 * contains some buffered output now. Write this out to F, and reset 147 * contains some buffered output now. Write this out to F, and reset
147 * the buffer cursor. 148 * the buffer cursor.
148 */ 149 */
149rs_result rs_outfilebuf_drain(rs_job_t *job, rs_buffers_t *buf, void *opaque) 150rs_result rs_outfilebuf_drain(rs_job_t *job, rs_buffers_t *buf, void *opaque)
150{ 151{
151 job=job;
152 int present; 152 int present;
153 rs_filebuf_t *fb = (rs_filebuf_t *) opaque; 153 rs_filebuf_t *fb = (rs_filebuf_t *) opaque;
154 FILE *f = fb->f; 154 FILE *f = fb->f;
155 155
156 job=job; // fix unused warning
157
156 /* This is only allowed if either the buf has no output buffer 158 /* This is only allowed if either the buf has no output buffer
157 * yet, or that buffer could possibly be BUF. */ 159 * yet, or that buffer could possibly be BUF. */
158 if (buf->next_out == NULL) { 160 if (buf->next_out == NULL) {
159 assert(buf->avail_out == 0); 161 assert(buf->avail_out == 0);
160 162
161 buf->next_out = fb->buf; 163 buf->next_out = fb->buf;