summaryrefslogtreecommitdiff
authorschurig <schurig>2004-09-10 12:48:25 (UTC)
committer schurig <schurig>2004-09-10 12:48:25 (UTC)
commitf9fb882141b4a519ae958e6332fb5a8ef717d88c (patch) (side-by-side diff)
treea97e359f73a0afc98d4a58ba057676cf8da94f13
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 (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
@@ -87,28 +87,29 @@ void rs_filebuf_free(rs_filebuf_t *fb)
free(fb);
}
/*
* If the stream has no more data available, read some from F into
* BUF, and let the stream use that. On return, SEEN_EOF is true if
* the end of file has passed into the stream.
*/
rs_result rs_infilebuf_fill(rs_job_t *job, rs_buffers_t *buf,
void *opaque)
{
- job=job;
int len;
rs_filebuf_t *fb = (rs_filebuf_t *) opaque;
FILE *f = fb->f;
+
+ job=job; // fix unused warning
/* This is only allowed if either the buf has no input buffer
* yet, or that buffer could possibly be BUF. */
if (buf->next_in != NULL) {
assert(buf->avail_in <= fb->buf_len);
assert(buf->next_in >= fb->buf);
assert(buf->next_in <= fb->buf + fb->buf_len);
} else {
assert(buf->avail_in == 0);
}
if (buf->eof_in || (buf->eof_in = feof(f))) {
@@ -139,29 +140,30 @@ rs_result rs_infilebuf_fill(rs_job_t *job, rs_buffers_t *buf,
return RS_DONE;
}
/*
* The buf is already using BUF for an output buffer, and probably
* contains some buffered output now. Write this out to F, and reset
* the buffer cursor.
*/
rs_result rs_outfilebuf_drain(rs_job_t *job, rs_buffers_t *buf, void *opaque)
{
- job=job;
int present;
rs_filebuf_t *fb = (rs_filebuf_t *) opaque;
FILE *f = fb->f;
+ job=job; // fix unused warning
+
/* This is only allowed if either the buf has no output buffer
* yet, or that buffer could possibly be BUF. */
if (buf->next_out == NULL) {
assert(buf->avail_out == 0);
buf->next_out = fb->buf;
buf->avail_out = fb->buf_len;
return RS_DONE;
}
assert(buf->avail_out <= fb->buf_len);