ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "More big endian fixes."

Browse source 
This reverts commit edbcc797e0.

Broke regression text. Needs more attention.
This commit is contained in:
Con Kolivas 2011-03-21 19:01:24 +11:00
parent 44b93068a3
commit 06a76bc4aa
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
stream.c
View file

@ -811,7 +811,12 @@ static inline int read_u8(rzip_control *control, int f, uchar *v)
static inline int read_u32(rzip_control *control, int f, u32 *v) static inline int read_u32(rzip_control *control, int f, u32 *v)
{ {
return read_buf(control, f, (uchar *)v, 4); return le32toh(read_buf(control, f, (uchar *)v, 4));
}
static inline int read_i64(rzip_control *control, int f, i64 *v)
{
return le64toh(read_buf(control, f, (uchar *)v, 8));
} }
static inline int read_val(rzip_control *control, int f, i64 *v, int len) static inline int read_val(rzip_control *control, int f, i64 *v, int len)
@ -1084,15 +1089,12 @@ void *open_stream_in(rzip_control *control, int f, int n, int chunk_bytes)
goto failed; goto failed;
} }
/* Read in the expected chunk size */ /* Read in the expected chunk size */
if (!ENCRYPT) { if (unlikely(!ENCRYPT && read_val(control, f, &sinfo->size, sinfo->chunk_bytes))) {
if (unlikely(!read_val(control, f, &sinfo->size, sinfo->chunk_bytes))) { print_err("Failed to read in chunk size in open_stream_in\n");
print_err("Failed to read in chunk size in open_stream_in\n"); goto failed;
goto failed;
}
sinfo->size = le64toh(sinfo->size);
print_maxverbose("Chunk size: %lld\n", sinfo->size);
control->st_size += sinfo->size;
} }
print_maxverbose("Chunk size: %lld\n", sinfo->size);
control->st_size += sinfo->size;
} }
sinfo->initial_pos = get_readseek(control, f); sinfo->initial_pos = get_readseek(control, f);
@ -1144,9 +1146,6 @@ again:
if (ENCRYPT) if (ENCRYPT)
decrypt_header(control, enc_head, &c, &v1, &v2, &sinfo->s[i].last_head); decrypt_header(control, enc_head, &c, &v1, &v2, &sinfo->s[i].last_head);
v1 = le64toh(v1);
v2 = le64toh(v2);
sinfo->s[i].last_head = le64toh(sinfo->s[i].last_head);
if (unlikely(c == CTYPE_NONE && v1 == 0 && v2 == 0 && sinfo->s[i].last_head == 0 && i == 0)) { if (unlikely(c == CTYPE_NONE && v1 == 0 && v2 == 0 && sinfo->s[i].last_head == 0 && i == 0)) {
print_err("Enabling stream close workaround\n"); print_err("Enabling stream close workaround\n");
@ -1543,9 +1542,6 @@ fill_another:
if (unlikely(read_buf(control, sinfo->fd, blocksalt, SALT_LEN))) if (unlikely(read_buf(control, sinfo->fd, blocksalt, SALT_LEN)))
return -1; return -1;
} }
c_len = le64toh(c_len);
u_len = le64toh(u_len);
last_head = le64toh(last_head);
padded_len = MAX(c_len, MIN_SIZE); padded_len = MAX(c_len, MIN_SIZE);
fsync(control->fd_out); fsync(control->fd_out);