diff options
Diffstat (limited to 'xdelta3/xdelta3-test.h')
-rw-r--r-- | xdelta3/xdelta3-test.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h index 948a1d6..659bd31 100644 --- a/xdelta3/xdelta3-test.h +++ b/xdelta3/xdelta3-test.h | |||
@@ -109,7 +109,7 @@ mt_exp_rand (uint32_t mean, uint32_t max_value) | |||
109 | (double)UINT32_MAX)); | 109 | (double)UINT32_MAX)); |
110 | uint32_t x = (uint32_t) (mean_d * erand + 0.5); | 110 | uint32_t x = (uint32_t) (mean_d * erand + 0.5); |
111 | 111 | ||
112 | return min (x, max_value); | 112 | return xd3_min (x, max_value); |
113 | } | 113 | } |
114 | 114 | ||
115 | #if SHELL_TESTS | 115 | #if SHELL_TESTS |
@@ -300,7 +300,7 @@ test_make_inputs (xd3_stream *stream, xoff_t *ss_out, xoff_t *ts_out) | |||
300 | double add_prob = (left == 0) ? 0 : (add_left / (double) left); | 300 | double add_prob = (left == 0) ? 0 : (add_left / (double) left); |
301 | int do_copy; | 301 | int do_copy; |
302 | 302 | ||
303 | next = min (left, next); | 303 | next = xd3_min (left, next); |
304 | do_copy = (next > add_left || | 304 | do_copy = (next > add_left || |
305 | (mt_random (&static_mtrand) / \ | 305 | (mt_random (&static_mtrand) / \ |
306 | (double)USIZE_T_MAX) >= add_prob); | 306 | (double)USIZE_T_MAX) >= add_prob); |
@@ -735,10 +735,10 @@ test_address_cache (xd3_stream *stream, int unused) | |||
735 | p = (mt_random (&static_mtrand) / (double)USIZE_T_MAX); | 735 | p = (mt_random (&static_mtrand) / (double)USIZE_T_MAX); |
736 | prev_i = mt_random (&static_mtrand) % offset; | 736 | prev_i = mt_random (&static_mtrand) % offset; |
737 | nearby = (mt_random (&static_mtrand) % 256) % offset; | 737 | nearby = (mt_random (&static_mtrand) % 256) % offset; |
738 | nearby = max (1U, nearby); | 738 | nearby = xd3_max (1U, nearby); |
739 | 739 | ||
740 | if (p < 0.1) { addr = addrs[offset-nearby]; } | 740 | if (p < 0.1) { addr = addrs[offset-nearby]; } |
741 | else if (p < 0.4) { addr = min (addrs[prev_i] + nearby, offset-1); } | 741 | else if (p < 0.4) { addr = xd3_min (addrs[prev_i] + nearby, offset-1); } |
742 | else { addr = prev_i; } | 742 | else { addr = prev_i; } |
743 | 743 | ||
744 | if ((ret = xd3_encode_address (stream, addr, offset, & modes[offset]))) { return ret; } | 744 | if ((ret = xd3_encode_address (stream, addr, offset, & modes[offset]))) { return ret; } |
@@ -884,7 +884,7 @@ test_decompress_text (xd3_stream *stream, uint8_t *enc, usize_t enc_size, usize_ | |||
884 | 884 | ||
885 | input: | 885 | input: |
886 | /* Test decoding test_desize input bytes at a time */ | 886 | /* Test decoding test_desize input bytes at a time */ |
887 | take = min (enc_size - pos, test_desize); | 887 | take = xd3_min (enc_size - pos, test_desize); |
888 | CHECK(take > 0); | 888 | CHECK(take > 0); |
889 | 889 | ||
890 | xd3_avail_input (stream, enc + pos, take); | 890 | xd3_avail_input (stream, enc + pos, take); |
@@ -1440,7 +1440,7 @@ test_secondary (xd3_stream *stream, const xd3_sec_type *sec, usize_t groups) | |||
1440 | * decoding. Really looking for faults here. */ | 1440 | * decoding. Really looking for faults here. */ |
1441 | { | 1441 | { |
1442 | int i; | 1442 | int i; |
1443 | int bytes = min (compress_size, 10U); | 1443 | int bytes = xd3_min (compress_size, 10U); |
1444 | for (i = 0; i < bytes * 8; i += 1) | 1444 | for (i = 0; i < bytes * 8; i += 1) |
1445 | { | 1445 | { |
1446 | dec_input[i/8] ^= 1 << (i%8); | 1446 | dec_input[i/8] ^= 1 << (i%8); |