total_read field is no longer used.

This commit is contained in:
Con Kolivas 2011-03-16 08:32:16 +11:00
parent e1af8fb0c0
commit 519123966a
2 changed files with 0 additions and 12 deletions

View file

@ -229,7 +229,6 @@ struct stream_info {
i64 bufsize; i64 bufsize;
i64 cur_pos; i64 cur_pos;
i64 initial_pos; i64 initial_pos;
i64 total_read;
i64 ram_alloced; i64 ram_alloced;
i64 size; i64 size;
long thread_no; long thread_no;

View file

@ -1101,7 +1101,6 @@ again:
goto again; goto again;
} }
sinfo->total_read += header_length;
if (unlikely(c != CTYPE_NONE)) { if (unlikely(c != CTYPE_NONE)) {
print_err("Unexpected initial tag %d in streams\n", c); print_err("Unexpected initial tag %d in streams\n", c);
goto failed; goto failed;
@ -1418,8 +1417,6 @@ fill_another:
header_length = 25; header_length = 25;
} }
sinfo->total_read += header_length;
fsync(control->fd_out); fsync(control->fd_out);
s_buf = malloc(c_len + CBC_LEN); s_buf = malloc(c_len + CBC_LEN);
@ -1437,8 +1434,6 @@ fill_another:
if (unlikely(read_buf(control, sinfo->fd, s_buf, padded_len))) if (unlikely(read_buf(control, sinfo->fd, s_buf, padded_len)))
return -1; return -1;
sinfo->total_read += padded_len;
if (ENCRYPT) { if (ENCRYPT) {
print_maxverbose("Decrypting block \n"); print_maxverbose("Decrypting block \n");
if (unlikely(aes_crypt_cbc(&control->aes_ctx, AES_DECRYPT, if (unlikely(aes_crypt_cbc(&control->aes_ctx, AES_DECRYPT,
@ -1579,12 +1574,6 @@ int close_stream_in(void *ss)
struct stream_info *sinfo = ss; struct stream_info *sinfo = ss;
int i; int i;
#if 0
/* Unnecessary, we should already be here */
if (unlikely(lseek(sinfo->fd, sinfo->initial_pos + sinfo->total_read,
SEEK_SET) != sinfo->initial_pos + sinfo->total_read))
return -1;
#endif
for (i = 0; i < sinfo->num_streams; i++) for (i = 0; i < sinfo->num_streams; i++)
free(sinfo->s[i].buf); free(sinfo->s[i].buf);