lib/xz: replace min_t with min
PATCH 1/1 lib/xz: replace min_t with min
Use the simpler min() macro since the values are unsigned and compatible.
Signed-off-by Thorsten Blum <[email protected]>
--- lib/xz/xz_dec_bcj.c | 2 +- lib/xz/xz_dec_lzma2.c | 11 +++++------ lib/xz/xz_dec_stream.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-)
lib/xz/xz_dec_bcj.c +1 -1
@@ -466,7 +466,7 @@ static void bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b) {size_t copy_size; - copy_size =min_t (size_t, s->temp.filtered, b->out_size - b->out_pos); + copy_size =min (s->temp.filtered, b->out_size - b->out_pos);memcpy (b->out + b->out_pos, s->temp.buf, copy_size); b->out_pos += copy_size;
lib/xz/xz_dec_lzma2.c +5 -6
@@ -354,7 +354,7 @@ static bool dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist)if (dist >= dict->full || dist >= dict->size)return false; - left =min_t (size_t, dict->limit - dict->pos, *len); + left =min (dict->limit - dict->pos, *len); *len -= left; back = dict->pos - dist -1 ;
@@ -1098,9 +1098,8 @@ enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s, struct xz_buf *b)* the output buffer yet, we may run this loop * multiple times without changing s->lzma2.sequence. */ -dict_limit (&s->dict,min_t (size_t, - b->out_size - b->out_pos, - s->lzma2.uncompressed)); +dict_limit (&s->dict,min (b->out_size - b->out_pos, + s->lzma2.uncompressed));if (!lzma2_lzma (s, b))return XZ_DATA_ERROR ;
@@ -1260,8 +1259,8 @@ enum xz_ret xz_dec_microlzma_run(struct xz_dec_microlzma *s_ptr, s->dict.end = b->out_size - b->out_pos;while (true) { -dict_limit (&s->dict,min_t (size_t, b->out_size - b->out_pos, - s->lzma2.uncompressed)); +dict_limit (&s->dict,min (b->out_size - b->out_pos, + s->lzma2.uncompressed));if (!lzma2_lzma (s, b))return XZ_DATA_ERROR ;
lib/xz/xz_dec_stream.c +2 -2
@@ -155,8 +155,8 @@ static const uint8_t check_sizes[16] = {*/ static bool fill_temp (struct xz_dec *s,struct xz_buf *b) { -size_t copy_size =min_t (size_t, - b->in_size - b->in_pos, s->temp.size - s->temp.pos); +size_t copy_size =min (b->in_size - b->in_pos, + s->temp.size - s->temp.pos);memcpy (s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size); b->in_pos += copy_size;