summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--rsync/buf.c2
-rw-r--r--rsync/job.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/rsync/buf.c b/rsync/buf.c
index 2814583..c978fff 100644
--- a/rsync/buf.c
+++ b/rsync/buf.c
@@ -87,24 +87,25 @@ void rs_filebuf_free(rs_filebuf_t *fb)
87 free(fb); 87 free(fb);
88} 88}
89 89
90 90
91/* 91/*
92 * If the stream has no more data available, read some from F into 92 * If the stream has no more data available, read some from F into
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;
99 int len; 100 int len;
100 rs_filebuf_t *fb = (rs_filebuf_t *) opaque; 101 rs_filebuf_t *fb = (rs_filebuf_t *) opaque;
101 FILE *f = fb->f; 102 FILE *f = fb->f;
102 103
103 /* This is only allowed if either the buf has no input buffer 104 /* This is only allowed if either the buf has no input buffer
104 * yet, or that buffer could possibly be BUF. */ 105 * yet, or that buffer could possibly be BUF. */
105 if (buf->next_in != NULL) { 106 if (buf->next_in != NULL) {
106 assert(buf->avail_in <= fb->buf_len); 107 assert(buf->avail_in <= fb->buf_len);
107 assert(buf->next_in >= fb->buf); 108 assert(buf->next_in >= fb->buf);
108 assert(buf->next_in <= fb->buf + fb->buf_len); 109 assert(buf->next_in <= fb->buf + fb->buf_len);
109 } else { 110 } else {
110 assert(buf->avail_in == 0); 111 assert(buf->avail_in == 0);
@@ -138,24 +139,25 @@ rs_result rs_infilebuf_fill(rs_job_t *job, rs_buffers_t *buf,
138 139
139 return RS_DONE; 140 return RS_DONE;
140} 141}
141 142
142 143
143/* 144/*
144 * The buf is already using BUF for an output buffer, and probably 145 * The buf is already using BUF for an output buffer, and probably
145 * contains some buffered output now. Write this out to F, and reset 146 * contains some buffered output now. Write this out to F, and reset
146 * the buffer cursor. 147 * the buffer cursor.
147 */ 148 */
148rs_result rs_outfilebuf_drain(rs_job_t *job, rs_buffers_t *buf, void *opaque) 149rs_result rs_outfilebuf_drain(rs_job_t *job, rs_buffers_t *buf, void *opaque)
149{ 150{
151 job=job;
150 int present; 152 int present;
151 rs_filebuf_t *fb = (rs_filebuf_t *) opaque; 153 rs_filebuf_t *fb = (rs_filebuf_t *) opaque;
152 FILE *f = fb->f; 154 FILE *f = fb->f;
153 155
154 /* This is only allowed if either the buf has no output buffer 156 /* This is only allowed if either the buf has no output buffer
155 * yet, or that buffer could possibly be BUF. */ 157 * yet, or that buffer could possibly be BUF. */
156 if (buf->next_out == NULL) { 158 if (buf->next_out == NULL) {
157 assert(buf->avail_out == 0); 159 assert(buf->avail_out == 0);
158 160
159 buf->next_out = fb->buf; 161 buf->next_out = fb->buf;
160 buf->avail_out = fb->buf_len; 162 buf->avail_out = fb->buf_len;
161 163
diff --git a/rsync/job.c b/rsync/job.c
index 680982d..36f39f0 100644
--- a/rsync/job.c
+++ b/rsync/job.c
@@ -85,24 +85,25 @@ void rs_job_check(rs_job_t *job)
85rs_result rs_job_free(rs_job_t *job) 85rs_result rs_job_free(rs_job_t *job)
86{ 86{
87 rs_bzero(job, sizeof *job); 87 rs_bzero(job, sizeof *job);
88 free(job); 88 free(job);
89 89
90 return RS_DONE; 90 return RS_DONE;
91} 91}
92 92
93 93
94 94
95static rs_result rs_job_s_complete(rs_job_t *job) 95static rs_result rs_job_s_complete(rs_job_t *job)
96{ 96{
97 job = job;
97 rs_fatal("should not be reached"); 98 rs_fatal("should not be reached");
98 return RS_INTERNAL_ERROR; 99 return RS_INTERNAL_ERROR;
99} 100}
100 101
101 102
102static rs_result rs_job_complete(rs_job_t *job, rs_result result) 103static rs_result rs_job_complete(rs_job_t *job, rs_result result)
103{ 104{
104 rs_job_check(job); 105 rs_job_check(job);
105 106
106 job->statefn = rs_job_s_complete; 107 job->statefn = rs_job_s_complete;
107 job->final_result = result; 108 job->final_result = result;
108 109