diff options
| author | vlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4> | 2012-03-26 09:19:12 +0000 |
|---|---|---|
| committer | vlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4> | 2012-03-26 09:19:12 +0000 |
| commit | cf82a6759ff44176a9982e948bca2a1db539c45e (patch) | |
| tree | 8863ea0a5cd5d38e91475a89728452afd7bb3659 | |
| parent | 62c85127106b4d29e89cb425eae6500ad235b2be (diff) | |
| download | mpfr-cf82a6759ff44176a9982e948bca2a1db539c45e.tar.gz | |
MPFR_ASSERTD or MPFR_ASSERTN must be used for assertions, not ASSERT.
git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@8123 280ebfd0-de03-0410-8827-d642c229c3f4
| -rw-r--r-- | src/fpif.c | 8 | ||||
| -rw-r--r-- | src/get_ld.c | 2 | ||||
| -rw-r--r-- | src/mpfr-gmp.h | 1 | ||||
| -rwxr-xr-x | tools/mpfrlint | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/fpif.c b/src/fpif.c index 20713b027..061af44d1 100644 --- a/src/fpif.c +++ b/src/fpif.c @@ -78,7 +78,7 @@ putBigEndianData (unsigned char * result, unsigned char * data, { unsigned int j; - ASSERT(data_size <= data_max_size); + MPFR_ASSERTD (data_size <= data_max_size); for (j = 0; j < data_size; j++) result[j] = data[data_max_size - j - 1]; } @@ -93,7 +93,7 @@ putLittleEndianData (unsigned char * result, unsigned char * data, size_t data_max_size, size_t data_size) #endif { - ASSERT(data_size <= data_max_size); + MPFR_ASSERTD (data_size <= data_max_size); memcpy (result, data, data_size); } @@ -109,7 +109,7 @@ getBigEndianData (unsigned char * result, unsigned char * data, { unsigned int j; - ASSERT(data_size <= data_max_size); + MPFR_ASSERTD (data_size <= data_max_size); for (j = 0; j < data_size; j++) result[data_max_size - j - 1] = data[j]; } @@ -124,7 +124,7 @@ getLittleEndianData (unsigned char * result, unsigned char * data, size_t data_max_size, size_t data_size) #endif { - ASSERT(data_size <= data_max_size); + MPFR_ASSERTD (data_size <= data_max_size); memcpy (result, data, data_size); } diff --git a/src/get_ld.c b/src/get_ld.c index a84aed1ee..89621275a 100644 --- a/src/get_ld.c +++ b/src/get_ld.c @@ -68,7 +68,7 @@ mpfr_get_ld (mpfr_srcptr x, mpfr_rnd_t rnd_mode) subnormal number. The smallest positive subnormal number is 2^(-16445) which is 0.5*2^(-16444) in MPFR thus 0 <= denorm <= 63. */ denorm = MPFR_UNLIKELY (e <= -16382) ? - e - 16382 + 1 : 0; - ASSERT(0 <= denorm && denorm < 64); + MPFR_ASSERTD (0 <= denorm && denorm < 64); #if GMP_NUMB_BITS >= 64 ld.s.manl = (tmpmant[0] >> denorm); ld.s.manh = (tmpmant[0] >> denorm) >> 32; diff --git a/src/mpfr-gmp.h b/src/mpfr-gmp.h index 03f9648a6..c4c6f1fc7 100644 --- a/src/mpfr-gmp.h +++ b/src/mpfr-gmp.h @@ -157,6 +157,7 @@ __MPFR_DECLSPEC void mpfr_assert_fail _MPFR_PROTO((const char *, int, const char *)); #define ASSERT_FAIL(expr) mpfr_assert_fail (__FILE__, __LINE__, #expr) +/* ASSERT() is for mpfr-longlong.h only. */ #define ASSERT(expr) MPFR_ASSERTD(expr) /* Access fileds of GMP struct */ diff --git a/tools/mpfrlint b/tools/mpfrlint index 5f1f0d1fb..a2276cf50 100755 --- a/tools/mpfrlint +++ b/tools/mpfrlint @@ -48,6 +48,9 @@ grep '[^a-z_]snprintf *([^)]' $srctests # This test is a heuristic. grep 'MPFR_ASSERTD[^a-z]*;' src/*.c +# MPFR_ASSERTD or MPFR_ASSERTN must be used for assertions, not ASSERT. +grep '[^_]ASSERT[ (]' {src,tests}/*.c + # Use MPFR_TMP_LIMBS_ALLOC. grep 'MPFR_TMP_ALLOC.*\(BYTES_PER_MP_LIMB\|sizeof.*mp_limb_t\)' src/*.c |