diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2013-09-03 10:03:22 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-09-03 16:00:26 +0200 |
| commit | 2db20f970cb0ada26358482c49f6c1dce5ea4ea2 (patch) | |
| tree | 233428643b9fa1031ec058c2bc270fd664c5daa9 | |
| parent | 07f8737113dfa6d5f8afe76bf7d3170e2c766e35 (diff) | |
| download | sssd-2db20f970cb0ada26358482c49f6c1dce5ea4ea2.tar.gz sssd-2db20f970cb0ada26358482c49f6c1dce5ea4ea2.tar.xz sssd-2db20f970cb0ada26358482c49f6c1dce5ea4ea2.zip | |
UTIL: Use standard maximum value of type size_t
It is better to use standard constant for maximum value of type size_t,
instead of reinventing wheel with own defined constant SIZE_T_MAX
This patch replace string "SIZE_T_MAX" -> "SIZE_MAX"
| -rw-r--r-- | src/tests/util-tests.c | 12 | ||||
| -rw-r--r-- | src/util/util.h | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/tests/util-tests.c b/src/tests/util-tests.c index 3628b0a6b..69fdf156e 100644 --- a/src/tests/util-tests.c +++ b/src/tests/util-tests.c @@ -388,14 +388,14 @@ END_TEST START_TEST(test_size_t_overflow) { fail_unless(!SIZE_T_OVERFLOW(1, 1), "unexpected overflow"); - fail_unless(!SIZE_T_OVERFLOW(SIZE_T_MAX, 0), "unexpected overflow"); - fail_unless(!SIZE_T_OVERFLOW(SIZE_T_MAX-10, 10), "unexpected overflow"); - fail_unless(SIZE_T_OVERFLOW(SIZE_T_MAX, 1), "overflow not detected"); - fail_unless(SIZE_T_OVERFLOW(SIZE_T_MAX, SIZE_T_MAX), + fail_unless(!SIZE_T_OVERFLOW(SIZE_MAX, 0), "unexpected overflow"); + fail_unless(!SIZE_T_OVERFLOW(SIZE_MAX-10, 10), "unexpected overflow"); + fail_unless(SIZE_T_OVERFLOW(SIZE_MAX, 1), "overflow not detected"); + fail_unless(SIZE_T_OVERFLOW(SIZE_MAX, SIZE_MAX), "overflow not detected"); - fail_unless(SIZE_T_OVERFLOW(SIZE_T_MAX, ULLONG_MAX), + fail_unless(SIZE_T_OVERFLOW(SIZE_MAX, ULLONG_MAX), "overflow not detected"); - fail_unless(SIZE_T_OVERFLOW(SIZE_T_MAX, -10), "overflow not detected"); + fail_unless(SIZE_T_OVERFLOW(SIZE_MAX, -10), "overflow not detected"); } END_TEST diff --git a/src/util/util.h b/src/util/util.h index 606eab03f..eab1f7880 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -276,10 +276,8 @@ errno_t set_debug_file_from_fd(const int fd); #define OUT_OF_ID_RANGE(id, min, max) \ (id == 0 || (min && (id < min)) || (max && (id > max))) -#define SIZE_T_MAX ((size_t) -1) - #define SIZE_T_OVERFLOW(current, add) \ - (((size_t)(add)) > (SIZE_T_MAX - ((size_t)(current)))) + (((size_t)(add)) > (SIZE_MAX - ((size_t)(current)))) static inline void safealign_memcpy(void *dest, const void *src, size_t n, size_t *counter) |