is a tool and library for differential compression (supports VCDIFF encoding and decoding).
| xdelta3-internal.h (xdelta3-3.0.10) | : | xdelta3-internal.h (xdelta3-3.0.11) |
|---|
| | |
| skipping to change at line 224 | | skipping to change at line 224 |
|---|
| stream->msg = "further input required"; \ | | stream->msg = "further input required"; \ |
| return XD3_INPUT | | return XD3_INPUT |
| | |
| #define READ_INTEGER_TYPE(TYPE, OFLOW) \ | | #define READ_INTEGER_TYPE(TYPE, OFLOW) \ |
| TYPE val = 0; \ | | TYPE val = 0; \ |
| const uint8_t *inp = (*inpp); \ | | const uint8_t *inp = (*inpp); \ |
| usize_t next; \ | | usize_t next; \ |
| \ | | \ |
| do \ | | do \ |
| { \ | | { \ |
|
| if (inp == max) \ | | if (inp == maxp) \ |
| { \ | | { \ |
| stream->msg = "end-of-input in read_integer"; \ | | stream->msg = "end-of-input in read_integer"; \ |
| return XD3_INVALID_INPUT; \ | | return XD3_INVALID_INPUT; \ |
| } \ | | } \ |
| \ | | \ |
| if (val & OFLOW) \ | | if (val & OFLOW) \ |
| { \ | | { \ |
| stream->msg = "overflow in read_intger"; \ | | stream->msg = "overflow in read_intger"; \ |
| return XD3_INVALID_INPUT; \ | | return XD3_INVALID_INPUT; \ |
| } \ | | } \ |
| | |
| skipping to change at line 284 | | skipping to change at line 284 |
|---|
| IF_SIZEOF32(4); | | IF_SIZEOF32(4); |
| return 5; | | return 5; |
| } | | } |
| | |
| static inline int | | static inline int |
| xd3_decode_uint32_t (xd3_stream *stream, uint32_t *val) | | xd3_decode_uint32_t (xd3_stream *stream, uint32_t *val) |
| { DECODE_INTEGER_TYPE (stream->dec_32part, UINT32_OFLOW_MASK); } | | { DECODE_INTEGER_TYPE (stream->dec_32part, UINT32_OFLOW_MASK); } |
| | |
| static inline int | | static inline int |
| xd3_read_uint32_t (xd3_stream *stream, const uint8_t **inpp, | | xd3_read_uint32_t (xd3_stream *stream, const uint8_t **inpp, |
|
| const uint8_t *max, uint32_t *valp) | | const uint8_t *maxp, uint32_t *valp) |
| { READ_INTEGER_TYPE (uint32_t, UINT32_OFLOW_MASK); } | | { READ_INTEGER_TYPE (uint32_t, UINT32_OFLOW_MASK); } |
| | |
| #if XD3_ENCODER | | #if XD3_ENCODER |
| static inline int | | static inline int |
| xd3_emit_uint32_t (xd3_stream *stream, xd3_output **output, uint32_t num) | | xd3_emit_uint32_t (xd3_stream *stream, xd3_output **output, uint32_t num) |
| { EMIT_INTEGER_TYPE (); } | | { EMIT_INTEGER_TYPE (); } |
| #endif | | #endif |
| #endif | | #endif |
| | |
| #if USE_UINT64 | | #if USE_UINT64 |
| | |
| skipping to change at line 309 | | skipping to change at line 309 |
|---|
| #if XD3_ENCODER | | #if XD3_ENCODER |
| static inline int | | static inline int |
| xd3_emit_uint64_t (xd3_stream *stream, xd3_output **output, uint64_t num) | | xd3_emit_uint64_t (xd3_stream *stream, xd3_output **output, uint64_t num) |
| { EMIT_INTEGER_TYPE (); } | | { EMIT_INTEGER_TYPE (); } |
| #endif | | #endif |
| | |
| /* These are tested but not used */ | | /* These are tested but not used */ |
| #if REGRESSION_TEST | | #if REGRESSION_TEST |
| static int | | static int |
| xd3_read_uint64_t (xd3_stream *stream, const uint8_t **inpp, | | xd3_read_uint64_t (xd3_stream *stream, const uint8_t **inpp, |
|
| const uint8_t *max, uint64_t *valp) | | const uint8_t *maxp, uint64_t *valp) |
| { READ_INTEGER_TYPE (uint64_t, UINT64_OFLOW_MASK); } | | { READ_INTEGER_TYPE (uint64_t, UINT64_OFLOW_MASK); } |
| | |
| static uint32_t | | static uint32_t |
| xd3_sizeof_uint64_t (uint64_t num) | | xd3_sizeof_uint64_t (uint64_t num) |
| { | | { |
| IF_SIZEOF64(1); | | IF_SIZEOF64(1); |
| IF_SIZEOF64(2); | | IF_SIZEOF64(2); |
| IF_SIZEOF64(3); | | IF_SIZEOF64(3); |
| IF_SIZEOF64(4); | | IF_SIZEOF64(4); |
| IF_SIZEOF64(5); | | IF_SIZEOF64(5); |
| | |
| skipping to change at line 333 | | skipping to change at line 333 |
|---|
| IF_SIZEOF64(9); | | IF_SIZEOF64(9); |
| | |
| return 10; | | return 10; |
| } | | } |
| #endif | | #endif |
| | |
| #endif | | #endif |
| | |
| #if SIZEOF_USIZE_T == 4 | | #if SIZEOF_USIZE_T == 4 |
| #define USIZE_T_MAX UINT32_MAX | | #define USIZE_T_MAX UINT32_MAX |
|
| | #define USIZE_T_MAXBLKSZ 0x80000000U |
| #define xd3_decode_size xd3_decode_uint32_t | | #define xd3_decode_size xd3_decode_uint32_t |
| #define xd3_emit_size xd3_emit_uint32_t | | #define xd3_emit_size xd3_emit_uint32_t |
| #define xd3_sizeof_size xd3_sizeof_uint32_t | | #define xd3_sizeof_size xd3_sizeof_uint32_t |
| #define xd3_read_size xd3_read_uint32_t | | #define xd3_read_size xd3_read_uint32_t |
| #elif SIZEOF_USIZE_T == 8 | | #elif SIZEOF_USIZE_T == 8 |
| #define USIZE_T_MAX UINT64_MAX | | #define USIZE_T_MAX UINT64_MAX |
|
| | #define USIZE_T_MAXBLKSZ 0x8000000000000000ULL |
| #define xd3_decode_size xd3_decode_uint64_t | | #define xd3_decode_size xd3_decode_uint64_t |
| #define xd3_emit_size xd3_emit_uint64_t | | #define xd3_emit_size xd3_emit_uint64_t |
| #define xd3_sizeof_size xd3_sizeof_uint64_t | | #define xd3_sizeof_size xd3_sizeof_uint64_t |
| #define xd3_read_size xd3_read_uint64_t | | #define xd3_read_size xd3_read_uint64_t |
| #endif | | #endif |
| | |
| #if SIZEOF_XOFF_T == 4 | | #if SIZEOF_XOFF_T == 4 |
| #define XOFF_T_MAX UINT32_MAX | | #define XOFF_T_MAX UINT32_MAX |
| #define xd3_emit_offset xd3_emit_uint32_t | | #define xd3_emit_offset xd3_emit_uint32_t |
| static inline int | | static inline int |
| | | |
| End of changes. 5 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 