Rename puffs_base_make_slice_u8_subslice_ij.

This commit is contained in:
Nigel Tao committed 2017-10-02 14:33:45 +11:00
1 parent 6c53fde1da
commit 9b6a1760cd
5 files changed
+20 -26

No files matched your search

+6 -8
View File
@@ -348,7 +348,7 @@ static inline uint32_t puffs_base_load_u32le(uint8_t* p) {
((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24);
}
static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i(
static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_i(
puffs_base_slice_u8 s,
uint64_t i) {
if ((i <= SIZE_MAX) && (i <= s.len)) {
@@ -360,7 +360,7 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i(
return ((puffs_base_slice_u8){});
}
static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j(
static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_j(
puffs_base_slice_u8 s,
uint64_t j) {
if ((j <= SIZE_MAX) && (j <= s.len)) {
@@ -369,10 +369,8 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j(
return ((puffs_base_slice_u8){});
}
static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_ij(
puffs_base_slice_u8 s,
uint64_t i,
uint64_t j) {
static inline puffs_base_slice_u8
puffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) {
if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {
return ((puffs_base_slice_u8){
.ptr = s.ptr + i,
@@ -684,13 +682,13 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
self->private_impl.f_history_index = 32768;
} else {
v_n = puffs_base_slice_u8_copy_from(
puffs_base_make_slice_u8_subslice_i(
puffs_base_slice_u8_subslice_i(
((puffs_base_slice_u8){.ptr = self->private_impl.f_history,
.len = 32768}),
self->private_impl.f_history_index & 32767),
v_written);
if (v_n < ((uint64_t)(v_written.len))) {
v_written = puffs_base_make_slice_u8_subslice_i(v_written, v_n);
v_written = puffs_base_slice_u8_subslice_i(v_written, v_n);
v_n = puffs_base_slice_u8_copy_from(
((puffs_base_slice_u8){.ptr = self->private_impl.f_history,
.len = 32768}),
+4 -6
View File
@@ -318,7 +318,7 @@ static inline uint32_t puffs_base_load_u32le(uint8_t* p) {
((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24);
}
static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i(
static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_i(
puffs_base_slice_u8 s,
uint64_t i) {
if ((i <= SIZE_MAX) && (i <= s.len)) {
@@ -330,7 +330,7 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i(
return ((puffs_base_slice_u8){});
}
static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j(
static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_j(
puffs_base_slice_u8 s,
uint64_t j) {
if ((j <= SIZE_MAX) && (j <= s.len)) {
@@ -339,10 +339,8 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j(
return ((puffs_base_slice_u8){});
}
static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_ij(
puffs_base_slice_u8 s,
uint64_t i,
uint64_t j) {
static inline puffs_base_slice_u8
puffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) {
if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {
return ((puffs_base_slice_u8){
.ptr = s.ptr + i,