diff options
author | vlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4> | 2014-02-13 12:34:07 +0000 |
---|---|---|
committer | vlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4> | 2014-02-13 12:34:07 +0000 |
commit | 21a9e243e5a88252a55a3eb6dc6e0a80cd1f7c1c (patch) | |
tree | cd3b9319b549ddf9d9639bffe55a0acf25c2fe55 | |
parent | 7c761d08d0bfcfb363622091fa85e24a267e9129 (diff) | |
download | mpfr-21a9e243e5a88252a55a3eb6dc6e0a80cd1f7c1c.tar.gz |
[src/bernoulli.c] GNU style.
[src/mpfr-impl.h] Corrected prototypes.
git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@8964 280ebfd0-de03-0410-8827-d642c229c3f4
-rw-r--r-- | src/bernoulli.c | 65 | ||||
-rw-r--r-- | src/mpfr-impl.h | 4 |
2 files changed, 36 insertions, 33 deletions
diff --git a/src/bernoulli.c b/src/bernoulli.c index e224c6b5e..2d0c6feea 100644 --- a/src/bernoulli.c +++ b/src/bernoulli.c @@ -85,43 +85,46 @@ mpfr_bernoulli_cache (unsigned long n) { unsigned long i; - if (n >= bernoulli_size) { - if (bernoulli_alloc == 0) - { - bernoulli_alloc = MAX(16, n + n/4); - bernoulli_table = (mpz_t *) - (*__gmp_allocate_func) (bernoulli_alloc * sizeof (mpz_t)); - bernoulli_size = 0; - } - else if (n >= bernoulli_alloc) - { - bernoulli_table = (mpz_t *) (*__gmp_reallocate_func) - (bernoulli_table, bernoulli_alloc * sizeof (mpz_t), - (n + n/4) * sizeof (mpz_t)); - bernoulli_alloc = n + n/4; - } - MPFR_ASSERTD(bernoulli_alloc > n); - MPFR_ASSERTD(bernoulli_size >= 0); - for(i = bernoulli_size; i <= n; i++) - mpfr_bernoulli_internal(bernoulli_table, i); - bernoulli_size = n+1; - } - MPFR_ASSERTD(bernoulli_size > n); + if (n >= bernoulli_size) + { + if (bernoulli_alloc == 0) + { + bernoulli_alloc = MAX(16, n + n/4); + bernoulli_table = (mpz_t *) + (*__gmp_allocate_func) (bernoulli_alloc * sizeof (mpz_t)); + bernoulli_size = 0; + } + else if (n >= bernoulli_alloc) + { + bernoulli_table = (mpz_t *) (*__gmp_reallocate_func) + (bernoulli_table, bernoulli_alloc * sizeof (mpz_t), + (n + n/4) * sizeof (mpz_t)); + bernoulli_alloc = n + n/4; + } + MPFR_ASSERTD (bernoulli_alloc > n); + MPFR_ASSERTD (bernoulli_size >= 0); + for(i = bernoulli_size; i <= n; i++) + mpfr_bernoulli_internal (bernoulli_table, i); + bernoulli_size = n+1; + } + MPFR_ASSERTD (bernoulli_size > n); return bernoulli_table[n]; } void -mpfr_bernoulli_freecache(void) +mpfr_bernoulli_freecache (void) { unsigned long i; - if (bernoulli_table != NULL) { - for(i = 0; i < bernoulli_size; i++) { - mpz_clear (bernoulli_table[i]); + if (bernoulli_table != NULL) + { + for (i = 0; i < bernoulli_size; i++) + { + mpz_clear (bernoulli_table[i]); + } + (*__gmp_free_func) (bernoulli_table, bernoulli_alloc * sizeof (mpz_t)); + bernoulli_table = NULL; + bernoulli_alloc = 0; + bernoulli_size = 0; } - (*__gmp_free_func) (bernoulli_table, bernoulli_alloc * sizeof (mpz_t)); - bernoulli_table = NULL; - bernoulli_alloc = 0; - bernoulli_size = 0; - } } diff --git a/src/mpfr-impl.h b/src/mpfr-impl.h index f7ec07a66..6d1b073f2 100644 --- a/src/mpfr-impl.h +++ b/src/mpfr-impl.h @@ -1988,8 +1988,8 @@ __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t, __MPFR_DECLSPEC void mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*, unsigned long)); - __MPFR_DECLSPEC mpz_srcptr mpfr_bernoulli_cache (unsigned long n); - __MPFR_DECLSPEC void mpfr_bernoulli_freecache(void); +__MPFR_DECLSPEC mpz_srcptr mpfr_bernoulli_cache _MPFR_PROTO ((unsigned long)); +__MPFR_DECLSPEC void mpfr_bernoulli_freecache _MPFR_PROTO ((void)); __MPFR_DECLSPEC int mpfr_sincos_fast _MPFR_PROTO((mpfr_t, mpfr_t, mpfr_srcptr, mpfr_rnd_t)); |