math/...: Make a number of functions be const-correct.

diff --git a/math/ec-info.c b/math/ec-info.c
index 017c498229d1a3b1b9c8701f75476b52c0ca8ae6..f57f92c09c39448c99a00b3b7ba6249d417ff881 100644 (file)
--- a/math/ec-info.c
+++ b/math/ec-info.c
@@ -494,14 +494,14 @@ const char *ec_getinfo(ec_info *ei, const char *p)
 
 /* --- @ec_sameinfop@ --- *
  *
 
 /* --- @ec_sameinfop@ --- *
  *

- * Arguments:  @ec_info *ei, *ej@ = two elliptic curve parameter sets
+ * Arguments:  @const ec_info *ei, *ej@ = two elliptic curve parameter sets

  *
  * Returns:    Nonzero if the curves are identical (not just isomorphic).
  *
  * Use:                Checks for sameness of curve parameters.
  */
 
  *
  * Returns:    Nonzero if the curves are identical (not just isomorphic).
  *
  * Use:                Checks for sameness of curve parameters.
  */
 

-int ec_sameinfop(ec_info *ei, ec_info *ej)
+int ec_sameinfop(const ec_info *ei, const ec_info *ej)

 {
   return (ec_samep(ei->c, ej->c) &&
          MP_EQ(ei->r, ej->r) && MP_EQ(ei->h, ej->h) &&
 {
   return (ec_samep(ei->c, ej->c) &&
          MP_EQ(ei->r, ej->r) && MP_EQ(ei->h, ej->h) &&

diff --git a/math/ec.h b/math/ec.h
index 3de2bb514bbde4ad943c4e1627ad764fa14b6267..c6be6aa47764ee33936c4814cc822f7995765149 100644 (file)
--- a/math/ec.h
+++ b/math/ec.h
@@ -580,14 +580,14 @@ extern const char *ec_getinfo(ec_info */*ei*/, const char */*p*/);
 
 /* --- @ec_sameinfop@ --- *
  *
 
 /* --- @ec_sameinfop@ --- *
  *

- * Arguments:  @ec_info *ei, *ej@ = two elliptic curve parameter sets
+ * Arguments:  @const ec_info *ei, *ej@ = two elliptic curve parameter sets

  *
  * Returns:    Nonzero if the curves are identical (not just isomorphic).
  *
  * Use:                Checks for sameness of curve parameters.
  */
 
  *
  * Returns:    Nonzero if the curves are identical (not just isomorphic).
  *
  * Use:                Checks for sameness of curve parameters.
  */
 

-extern int ec_sameinfop(ec_info */*ei*/, ec_info */*ej*/);
+extern int ec_sameinfop(const ec_info */*ei*/, const ec_info */*ej*/);

 
 /* --- @ec_freeinfo@ --- *
  *
 
 /* --- @ec_freeinfo@ --- *
  *

diff --git a/math/gfreduce.c b/math/gfreduce.c
index 83ffeb1027cd6b907d2a40b5af2144883791be57..99f3bea59a1b75efa29dadedcceb2a4b63393b79 100644 (file)
--- a/math/gfreduce.c
+++ b/math/gfreduce.c
@@ -297,7 +297,7 @@ void gfreduce_destroy(gfreduce *r)
 
 /* --- @gfreduce_dump@ --- *
  *
 
 /* --- @gfreduce_dump@ --- *
  *

- * Arguments:  @gfreduce *r@ = structure to dump
+ * Arguments:  @const gfreduce *r@ = structure to dump

  *             @FILE *fp@ = file to dump on
  *
  * Returns:    ---
  *             @FILE *fp@ = file to dump on
  *
  * Returns:    ---


@@ -305,7 +305,7 @@ void gfreduce_destroy(gfreduce *r)
  * Use:                Dumps a reduction context.
  */
 
  * Use:                Dumps a reduction context.
  */
 

-void gfreduce_dump(gfreduce *r, FILE *fp)
+void gfreduce_dump(const gfreduce *r, FILE *fp)

 {
   size_t i;
 
 {
   size_t i;
 


@@ -327,7 +327,7 @@ void gfreduce_dump(gfreduce *r, FILE *fp)
 
 /* --- @gfreduce_do@ --- *
  *
 
 /* --- @gfreduce_do@ --- *
  *

- * Arguments:  @gfreduce *r@ = reduction context
+ * Arguments:  @const gfreduce *r@ = reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = source
  *
  *             @mp *d@ = destination
  *             @mp *x@ = source
  *


@@ -350,7 +350,7 @@ static void run(const gfreduce_instr *i, const gfreduce_instr *il,
   }
 }
 
   }
 }
 

-mp *gfreduce_do(gfreduce *r, mp *d, mp *x)
+mp *gfreduce_do(const gfreduce *r, mp *d, mp *x)

 {
   mpw *v, *vl;
   const gfreduce_instr *il;
 {
   mpw *v, *vl;
   const gfreduce_instr *il;


@@ -392,14 +392,14 @@ mp *gfreduce_do(gfreduce *r, mp *d, mp *x)
 
 /* --- @gfreduce_sqrt@ --- *
  *
 
 /* --- @gfreduce_sqrt@ --- *
  *

- * Arguments:  @gfreduce *r@ = pointer to reduction context
+ * Arguments:  @const gfreduce *r@ = pointer to reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *
  * Returns:    The square root of @x@ modulo @r->p@, or null.
  */
 
  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *
  * Returns:    The square root of @x@ modulo @r->p@, or null.
  */
 

-mp *gfreduce_sqrt(gfreduce *r, mp *d, mp *x)
+mp *gfreduce_sqrt(const gfreduce *r, mp *d, mp *x)

 {
   mp *y = MP_COPY(x);
   mp *z, *spare = MP_NEW;
 {
   mp *y = MP_COPY(x);
   mp *z, *spare = MP_NEW;


@@ -430,7 +430,7 @@ mp *gfreduce_sqrt(gfreduce *r, mp *d, mp *x)
 
 /* --- @gfreduce_trace@ --- *
  *
 
 /* --- @gfreduce_trace@ --- *
  *

- * Arguments:  @gfreduce *r@ = pointer to reduction context
+ * Arguments:  @const gfreduce *r@ = pointer to reduction context

  *             @mp *x@ = some polynomial
  *
  * Returns:    The trace of @x@. (%$\Tr(x)=x + x^2 + \cdots + x^{2^{m-1}}$%
  *             @mp *x@ = some polynomial
  *
  * Returns:    The trace of @x@. (%$\Tr(x)=x + x^2 + \cdots + x^{2^{m-1}}$%


@@ -440,7 +440,7 @@ mp *gfreduce_sqrt(gfreduce *r, mp *d, mp *x)
  *             we only need a single bit to represent it.
  */
 
  *             we only need a single bit to represent it.
  */
 

-int gfreduce_trace(gfreduce *r, mp *x)
+int gfreduce_trace(const gfreduce *r, mp *x)

 {
   mp *y = MP_COPY(x);
   mp *spare = MP_NEW;
 {
   mp *y = MP_COPY(x);
   mp *spare = MP_NEW;


@@ -462,7 +462,7 @@ int gfreduce_trace(gfreduce *r, mp *x)
 
 /* --- @gfreduce_halftrace@ --- *
  *
 
 /* --- @gfreduce_halftrace@ --- *
  *

- * Arguments:  @gfreduce *r@ = pointer to reduction context
+ * Arguments:  @const gfreduce *r@ = pointer to reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *
  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *


@@ -471,7 +471,7 @@ int gfreduce_trace(gfreduce *r, mp *x)
  *             if %$x \in \gf{2^m}$% with %$m$% odd).
  */
 
  *             if %$x \in \gf{2^m}$% with %$m$% odd).
  */
 

-mp *gfreduce_halftrace(gfreduce *r, mp *d, mp *x)
+mp *gfreduce_halftrace(const gfreduce *r, mp *d, mp *x)

 {
   mp *y = MP_COPY(x);
   mp *spare = MP_NEW;
 {
   mp *y = MP_COPY(x);
   mp *spare = MP_NEW;


@@ -494,7 +494,7 @@ mp *gfreduce_halftrace(gfreduce *r, mp *d, mp *x)
 
 /* --- @gfreduce_quadsolve@ --- *
  *
 
 /* --- @gfreduce_quadsolve@ --- *
  *

- * Arguments:  @gfreduce *r@ = pointer to reduction context
+ * Arguments:  @const gfreduce *r@ = pointer to reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *
  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *


@@ -512,7 +512,7 @@ mp *gfreduce_halftrace(gfreduce *r, mp *d, mp *x)
  *             returns the one with zero scalar coefficient.
  */
 
  *             returns the one with zero scalar coefficient.
  */
 

-mp *gfreduce_quadsolve(gfreduce *r, mp *d, mp *x)
+mp *gfreduce_quadsolve(const gfreduce *r, mp *d, mp *x)

 {
   unsigned long m = mp_bits(r->p) - 1;
   mp *t;
 {
   unsigned long m = mp_bits(r->p) - 1;
   mp *t;


@@ -616,7 +616,7 @@ mp *gfreduce_quadsolve(gfreduce *r, mp *d, mp *x)
 
 /* --- @gfreduce_exp@ --- *
  *
 
 /* --- @gfreduce_exp@ --- *
  *

- * Arguments:  @gfreduce *gr@ = pointer to reduction context
+ * Arguments:  @const gfreduce *gr@ = pointer to reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -624,7 +624,7 @@ mp *gfreduce_quadsolve(gfreduce *r, mp *d, mp *x)
  * Returns:    Result, %$a^e \bmod m$%.
  */
 
  * Returns:    Result, %$a^e \bmod m$%.
  */
 

-mp *gfreduce_exp(gfreduce *gr, mp *d, mp *a, mp *e)
+mp *gfreduce_exp(const gfreduce *gr, mp *d, mp *a, mp *e)

 {
   mp *x = MP_ONE;
   mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;
 {
   mp *x = MP_ONE;
   mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;

diff --git a/math/gfreduce.h b/math/gfreduce.h
index ef075c45a75544df7bd19d31e0e78bf97fe6b50f..539b7c14073bd06835f004884dc2e99d15028be7 100644 (file)
--- a/math/gfreduce.h
+++ b/math/gfreduce.h
@@ -91,7 +91,7 @@ extern void gfreduce_destroy(gfreduce */*r*/);
 
 /* --- @gfreduce_dump@ --- *
  *
 
 /* --- @gfreduce_dump@ --- *
  *

- * Arguments:  @gfreduce *r@ = structure to dump
+ * Arguments:  @const gfreduce *r@ = structure to dump

  *             @FILE *fp@ = file to dump on
  *
  * Returns:    ---
  *             @FILE *fp@ = file to dump on
  *
  * Returns:    ---


@@ -99,33 +99,33 @@ extern void gfreduce_destroy(gfreduce */*r*/);
  * Use:                Dumps a reduction context.
  */
 
  * Use:                Dumps a reduction context.
  */
 

-extern void gfreduce_dump(gfreduce */*r*/, FILE */*fp*/);
+extern void gfreduce_dump(const gfreduce */*r*/, FILE */*fp*/);

 
 /* --- @gfreduce_do@ --- *
  *
 
 /* --- @gfreduce_do@ --- *
  *

- * Arguments:  @gfreduce *r@ = reduction context
+ * Arguments:  @const gfreduce *r@ = reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = source
  *
  * Returns:    Destination, @x@ reduced modulo the reduction poly.
  */
 
  *             @mp *d@ = destination
  *             @mp *x@ = source
  *
  * Returns:    Destination, @x@ reduced modulo the reduction poly.
  */
 

-extern mp *gfreduce_do(gfreduce */*r*/, mp */*d*/, mp */*x*/);
+extern mp *gfreduce_do(const gfreduce */*r*/, mp */*d*/, mp */*x*/);

 
 /* --- @gfreduce_sqrt@ --- *
  *
 
 /* --- @gfreduce_sqrt@ --- *
  *

- * Arguments:  @gfreduce *r@ = pointer to reduction context
+ * Arguments:  @const gfreduce *r@ = pointer to reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *
  * Returns:    The square root of @x@ modulo @r->p@, or null.
  */
 
  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *
  * Returns:    The square root of @x@ modulo @r->p@, or null.
  */
 

-extern mp *gfreduce_sqrt(gfreduce */*r*/, mp */*d*/, mp */*x*/);
+extern mp *gfreduce_sqrt(const gfreduce */*r*/, mp */*d*/, mp */*x*/);

 
 /* --- @gfreduce_trace@ --- *
  *
 
 /* --- @gfreduce_trace@ --- *
  *

- * Arguments:  @gfreduce *r@ = pointer to reduction context
+ * Arguments:  @const gfreduce *r@ = pointer to reduction context

  *             @mp *x@ = some polynomial
  *
  * Returns:    The trace of @x@. (%$\Tr(x)=x + x^2 + \cdots + x^{2^{m-1}}$%
  *             @mp *x@ = some polynomial
  *
  * Returns:    The trace of @x@. (%$\Tr(x)=x + x^2 + \cdots + x^{2^{m-1}}$%


@@ -135,11 +135,11 @@ extern mp *gfreduce_sqrt(gfreduce */*r*/, mp */*d*/, mp */*x*/);
  *             we only need a single bit to represent it.
  */
 
  *             we only need a single bit to represent it.
  */
 

-extern int gfreduce_trace(gfreduce */*r*/, mp */*x*/);
+extern int gfreduce_trace(const gfreduce */*r*/, mp */*x*/);

 
 /* --- @gfreduce_halftrace@ --- *
  *
 
 /* --- @gfreduce_halftrace@ --- *
  *

- * Arguments:  @gfreduce *r@ = pointer to reduction context
+ * Arguments:  @const gfreduce *r@ = pointer to reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *
  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *


@@ -148,11 +148,11 @@ extern int gfreduce_trace(gfreduce */*r*/, mp */*x*/);
  *             if %$x \in \gf{2^m}$% with %$m$% odd).
  */
 
  *             if %$x \in \gf{2^m}$% with %$m$% odd).
  */
 

-extern mp *gfreduce_halftrace(gfreduce */*r*/, mp */*d*/, mp */*x*/);
+extern mp *gfreduce_halftrace(const gfreduce */*r*/, mp */*d*/, mp */*x*/);

 
 /* --- @gfreduce_quadsolve@ --- *
  *
 
 /* --- @gfreduce_quadsolve@ --- *
  *

- * Arguments:  @gfreduce *r@ = pointer to reduction context
+ * Arguments:  @const gfreduce *r@ = pointer to reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *
  *             @mp *d@ = destination
  *             @mp *x@ = some polynomial
  *


@@ -170,11 +170,11 @@ extern mp *gfreduce_halftrace(gfreduce */*r*/, mp */*d*/, mp */*x*/);
  *             returns the one with zero scalar coefficient.
  */
 
  *             returns the one with zero scalar coefficient.
  */
 

-extern mp *gfreduce_quadsolve(gfreduce */*r*/, mp */*d*/, mp */*x*/);
+extern mp *gfreduce_quadsolve(const gfreduce */*r*/, mp */*d*/, mp */*x*/);

 
 /* --- @gfreduce_exp@ --- *
  *
 
 /* --- @gfreduce_exp@ --- *
  *

- * Arguments:  @gfreduce *gr@ = pointer to reduction context
+ * Arguments:  @const gfreduce *gr@ = pointer to reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -182,7 +182,8 @@ extern mp *gfreduce_quadsolve(gfreduce */*r*/, mp */*d*/, mp */*x*/);
  * Returns:    Result, %$a^e \bmod m$%.
  */
 
  * Returns:    Result, %$a^e \bmod m$%.
  */
 

-extern mp *gfreduce_exp(gfreduce */*gr*/, mp */*d*/, mp */*a*/, mp */*e*/);
+extern mp *gfreduce_exp(const gfreduce */*gr*/, mp */*d*/,
+                       mp */*a*/, mp */*e*/);

 
 /*----- That's all, folks -------------------------------------------------*/
 
 
 /*----- That's all, folks -------------------------------------------------*/
 

diff --git a/math/mpbarrett-exp.c b/math/mpbarrett-exp.c
index 44cad7ef31f175478024531e1f04306de3bf50af..27b74da0fb55e6d03a1d04f26a5532b5752e5fef 100644 (file)
--- a/math/mpbarrett-exp.c
+++ b/math/mpbarrett-exp.c
@@ -35,7 +35,7 @@
 
 /* --- @mpbarrett_exp@ --- *
  *
 
 /* --- @mpbarrett_exp@ --- *
  *

- * Arguments:  @mpbarrett *mb@ = pointer to Barrett reduction context
+ * Arguments:  @const mpbarrett *mb@ = pointer to Barrett reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -43,7 +43,7 @@
  * Returns:    Result, %$a^e \bmod m$%.
  */
 
  * Returns:    Result, %$a^e \bmod m$%.
  */
 

-mp *mpbarrett_exp(mpbarrett *mb, mp *d, mp *a, mp *e)
+mp *mpbarrett_exp(const mpbarrett *mb, mp *d, mp *a, mp *e)

 {
   mp *x = MP_ONE;
   mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;
 {
   mp *x = MP_ONE;
   mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;

diff --git a/math/mpbarrett-mexp.c b/math/mpbarrett-mexp.c
index ac1e16ae1fbe3d72ab4479a218b01fde4850af63..33818c4c856a760aa2f5793772566f58359f6127 100644 (file)
--- a/math/mpbarrett-mexp.c
+++ b/math/mpbarrett-mexp.c
@@ -37,7 +37,7 @@
 
 /* --- @mpbarrett_mexp@ --- *
  *
 
 /* --- @mpbarrett_mexp@ --- *
  *

- * Arguments:  @mpbarrett *mb@ = pointer to Barrett reduction context
+ * Arguments:  @const mpbarrett *mb@ = pointer to Barrett reduction context

  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied
  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied


@@ -49,7 +49,8 @@
  *             %$g_0^{e_0} g_1^{e_1} \ldots g_{n-1}^{e_{n-1}} \bmod m$%
  */
 
  *             %$g_0^{e_0} g_1^{e_1} \ldots g_{n-1}^{e_{n-1}} \bmod m$%
  */
 

-mp *mpbarrett_mexp(mpbarrett *mb, mp *d, const mp_expfactor *f, size_t n)
+mp *mpbarrett_mexp(const mpbarrett *mb, mp *d,
+                  const mp_expfactor *f, size_t n)

 {
   mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor));
   mp *a = MP_ONE;
 {
   mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor));
   mp *a = MP_ONE;

diff --git a/math/mpbarrett.c b/math/mpbarrett.c
index cadb9b36e182e63a668acb7f664bff051a123903..dbb16be246270bcb81c685205f9469d32b800d18 100644 (file)
--- a/math/mpbarrett.c
+++ b/math/mpbarrett.c
@@ -83,7 +83,7 @@ void mpbarrett_destroy(mpbarrett *mb)
 
 /* --- @mpbarrett_reduce@ --- *
  *
 
 /* --- @mpbarrett_reduce@ --- *
  *

- * Arguments:  @mpbarrett *mb@ = pointer to Barrett reduction context
+ * Arguments:  @const mpbarrett *mb@ = pointer to Barrett reduction context

  *             @mp *d@ = destination for result
  *             @mp *m@ = number to reduce
  *
  *             @mp *d@ = destination for result
  *             @mp *m@ = number to reduce
  *


@@ -93,7 +93,7 @@ void mpbarrett_destroy(mpbarrett *mb)
  * Use:                Performs an efficient modular reduction.
  */
 
  * Use:                Performs an efficient modular reduction.
  */
 

-mp *mpbarrett_reduce(mpbarrett *mb, mp *d, mp *m)
+mp *mpbarrett_reduce(const mpbarrett *mb, mp *d, mp *m)

 {
   mp *q;
   size_t k = mb->k;
 {
   mp *q;
   size_t k = mb->k;

diff --git a/math/mpbarrett.h b/math/mpbarrett.h
index b3ab798e12d4bf6ff06ef44e76aa51dd30a5ac80..ec022516287a17e890604b4388f7e1400f7738c8 100644 (file)
--- a/math/mpbarrett.h
+++ b/math/mpbarrett.h
@@ -113,7 +113,7 @@ extern void mpbarrett_destroy(mpbarrett */*mb*/);
 
 /* --- @mpbarrett_reduce@ --- *
  *
 
 /* --- @mpbarrett_reduce@ --- *
  *

- * Arguments:  @mpbarrett *mb@ = pointer to Barrett reduction context
+ * Arguments:  @const mpbarrett *mb@ = pointer to Barrett reduction context

  *             @mp *d@ = destination for result
  *             @mp *m@ = number to reduce
  *
  *             @mp *d@ = destination for result
  *             @mp *m@ = number to reduce
  *


@@ -123,11 +123,11 @@ extern void mpbarrett_destroy(mpbarrett */*mb*/);
  * Use:                Performs an efficient modular reduction.
  */
 
  * Use:                Performs an efficient modular reduction.
  */
 

-extern mp *mpbarrett_reduce(mpbarrett */*mb*/, mp */*d*/, mp */*m*/);
+extern mp *mpbarrett_reduce(const mpbarrett */*mb*/, mp */*d*/, mp */*m*/);

 
 /* --- @mpbarrett_exp@ --- *
  *
 
 /* --- @mpbarrett_exp@ --- *
  *

- * Arguments:  @mpbarrett *mb@ = pointer to Barrett reduction context
+ * Arguments:  @const mpbarrett *mb@ = pointer to Barrett reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -135,11 +135,12 @@ extern mp *mpbarrett_reduce(mpbarrett */*mb*/, mp */*d*/, mp */*m*/);
  * Returns:    Result, %$a^e \bmod m$%.
  */
 
  * Returns:    Result, %$a^e \bmod m$%.
  */
 

-extern mp *mpbarrett_exp(mpbarrett */*mb*/, mp */*d*/, mp */*a*/, mp */*e*/);
+extern mp *mpbarrett_exp(const mpbarrett */*mb*/, mp */*d*/,
+                        mp */*a*/, mp */*e*/);

 
 /* --- @mpbarrett_mexp@ --- *
  *
 
 /* --- @mpbarrett_mexp@ --- *
  *

- * Arguments:  @mpbarrett *mb@ = pointer to Barrett reduction context
+ * Arguments:  @const mpbarrett *mb@ = pointer to Barrett reduction context

  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied
  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied


@@ -151,7 +152,7 @@ extern mp *mpbarrett_exp(mpbarrett */*mb*/, mp */*d*/, mp */*a*/, mp */*e*/);
  *             %$g_0^{e_0} g_1^{e_1} \ldots g_{n-1}^{e_{n-1}} \bmod m$%
  */
 
  *             %$g_0^{e_0} g_1^{e_1} \ldots g_{n-1}^{e_{n-1}} \bmod m$%
  */
 

-extern mp *mpbarrett_mexp(mpbarrett */*mb*/, mp */*d*/,
+extern mp *mpbarrett_mexp(const mpbarrett */*mb*/, mp */*d*/,

                          const mp_expfactor */*f*/, size_t /*n*/);
 
 /*----- That's all, folks -------------------------------------------------*/
                          const mp_expfactor */*f*/, size_t /*n*/);
 
 /*----- That's all, folks -------------------------------------------------*/

diff --git a/math/mpmont-exp.c b/math/mpmont-exp.c
index 0ea554ea00b5ef762f8a505cb9759f165f279365..6b5c8c431fb4dab131d5985b4572f68f6a1567f1 100644 (file)
--- a/math/mpmont-exp.c
+++ b/math/mpmont-exp.c
@@ -35,7 +35,7 @@
 
 /* --- @mpmont_expr@ --- *
  *
 
 /* --- @mpmont_expr@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -43,7 +43,7 @@
  * Returns:    Result, %$(a R^{-1})^e R \bmod m$%.
  */
 
  * Returns:    Result, %$(a R^{-1})^e R \bmod m$%.
  */
 

-mp *mpmont_expr(mpmont *mm, mp *d, mp *a, mp *e)
+mp *mpmont_expr(const mpmont *mm, mp *d, mp *a, mp *e)

 {
   mp *x = MP_COPY(mm->r);
   mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;
 {
   mp *x = MP_COPY(mm->r);
   mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;


@@ -71,7 +71,7 @@ mp *mpmont_expr(mpmont *mm, mp *d, mp *a, mp *e)
 
 /* --- @mpmont_exp@ --- *
  *
 
 /* --- @mpmont_exp@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -79,7 +79,7 @@ mp *mpmont_expr(mpmont *mm, mp *d, mp *a, mp *e)
  * Returns:    Result, %$a^e \bmod m$%.
  */
 
  * Returns:    Result, %$a^e \bmod m$%.
  */
 

-mp *mpmont_exp(mpmont *mm, mp *d, mp *a, mp *e)
+mp *mpmont_exp(const mpmont *mm, mp *d, mp *a, mp *e)

 {
   e = MP_COPY(e);
   d = mpmont_mul(mm, d, a, mm->r2);
 {
   e = MP_COPY(e);
   d = mpmont_mul(mm, d, a, mm->r2);

diff --git a/math/mpmont-mexp.c b/math/mpmont-mexp.c
index 20a5f73b4be8f5007ca6751f52f2bf0df4da918e..9b0506bfc22bdb138c1f4946533047020533b541 100644 (file)
--- a/math/mpmont-mexp.c
+++ b/math/mpmont-mexp.c
@@ -37,7 +37,7 @@
 
 /* --- @mpmont_mexpr@ --- *
  *
 
 /* --- @mpmont_mexpr@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied
  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied


@@ -51,7 +51,7 @@
  *             except that the %$g_i$% and result are in Montgomery form.
  */
 
  *             except that the %$g_i$% and result are in Montgomery form.
  */
 

-static mp *mexpr(mpmont *mm, mp *d, mp_expfactor *f, size_t n)
+static mp *mexpr(const mpmont *mm, mp *d, mp_expfactor *f, size_t n)

 {
   mp *a = MP_COPY(mm->r);
   mp *spare = MP_NEW;
 {
   mp *a = MP_COPY(mm->r);
   mp *spare = MP_NEW;


@@ -76,7 +76,7 @@ static mp *mexpr(mpmont *mm, mp *d, mp_expfactor *f, size_t n)
   return (a);
 }
 
   return (a);
 }
 

-mp *mpmont_mexpr(mpmont *mm, mp *d, const mp_expfactor *f, size_t n)
+mp *mpmont_mexpr(const mpmont *mm, mp *d, const mp_expfactor *f, size_t n)

 {
   mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor));
   size_t i;
 {
   mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor));
   size_t i;


@@ -90,7 +90,7 @@ mp *mpmont_mexpr(mpmont *mm, mp *d, const mp_expfactor *f, size_t n)
 
 /* --- @mpmont_mexp@ --- *
  *
 
 /* --- @mpmont_mexp@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied
  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied


@@ -100,7 +100,7 @@ mp *mpmont_mexpr(mpmont *mm, mp *d, const mp_expfactor *f, size_t n)
  * Use:                Convenient interface over @mpmont_mexpr@.
  */
 
  * Use:                Convenient interface over @mpmont_mexpr@.
  */
 

-mp *mpmont_mexp(mpmont *mm, mp *d, const mp_expfactor *f, size_t n)
+mp *mpmont_mexp(const mpmont *mm, mp *d, const mp_expfactor *f, size_t n)

 {
   mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor));
   size_t i;
 {
   mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor));
   size_t i;

diff --git a/math/mpmont.c b/math/mpmont.c
index fe1e6457bdc5695bb24cc0729c45b33f02285f5c..f8a26119bf03492f8d0afd8281f1b11d29d5571d 100644 (file)
--- a/math/mpmont.c
+++ b/math/mpmont.c
@@ -211,7 +211,8 @@ static mulcore__functype *pick_mulcore(void)
 
 /* --- @finish@ --- *
  *
 
 /* --- @finish@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to a Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to a Montgomery reduction
+ *                     context

  *             *mp *d@ = pointer to mostly-reduced operand
  *
  * Returns:    ---
  *             *mp *d@ = pointer to mostly-reduced operand
  *
  * Returns:    ---


@@ -223,7 +224,7 @@ static mulcore__functype *pick_mulcore(void)
  *             need to do an additional subtraction if %$d$% is negative.
  */
 
  *             need to do an additional subtraction if %$d$% is negative.
  */
 

-static void finish(mpmont *mm, mp *d)
+static void finish(const mpmont *mm, mp *d)

 {
   mpw *dv = d->v, *dvl = d->vl;
   size_t n = mm->n;
 {
   mpw *dv = d->v, *dvl = d->vl;
   size_t n = mm->n;


@@ -328,7 +329,7 @@ void mpmont_destroy(mpmont *mm)
 
 /* --- @mpmont_reduce@ --- *
  *
 
 /* --- @mpmont_reduce@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = destination
  *             @mp *a@ = source, assumed positive
  *
  *             @mp *d@ = destination
  *             @mp *a@ = source, assumed positive
  *


@@ -337,7 +338,7 @@ void mpmont_destroy(mpmont *mm)
 
 #ifdef MPMONT_DISABLE
 
 
 #ifdef MPMONT_DISABLE
 

-mp *mpmont_reduce(mpmont *mm, mp *d, mp *a)
+mp *mpmont_reduce(const mpmont *mm, mp *d, mp *a)

 {
   mp_div(0, &d, a, mm->m);
   return (d);
 {
   mp_div(0, &d, a, mm->m);
   return (d);


@@ -345,7 +346,7 @@ mp *mpmont_reduce(mpmont *mm, mp *d, mp *a)
 
 #else
 
 
 #else
 

-mp *mpmont_reduce(mpmont *mm, mp *d, mp *a)
+mp *mpmont_reduce(const mpmont *mm, mp *d, mp *a)

 {
   size_t n = mm->n;
 
 {
   size_t n = mm->n;
 


@@ -387,7 +388,7 @@ mp *mpmont_reduce(mpmont *mm, mp *d, mp *a)
 
 /* --- @mpmont_mul@ --- *
  *
 
 /* --- @mpmont_mul@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = destination
  *             @mp *a, *b@ = sources, assumed positive
  *
  *             @mp *d@ = destination
  *             @mp *a, *b@ = sources, assumed positive
  *


@@ -396,7 +397,7 @@ mp *mpmont_reduce(mpmont *mm, mp *d, mp *a)
 
 #ifdef MPMONT_DISABLE
 
 
 #ifdef MPMONT_DISABLE
 

-mp *mpmont_mul(mpmont *mm, mp *d, mp *a, mp *b)
+mp *mpmont_mul(const mpmont *mm, mp *d, mp *a, mp *b)

 {
   d = mp_mul(d, a, b);
   mp_div(0, &d, d, mm->m);
 {
   d = mp_mul(d, a, b);
   mp_div(0, &d, d, mm->m);


@@ -405,7 +406,7 @@ mp *mpmont_mul(mpmont *mm, mp *d, mp *a, mp *b)
 
 #else
 
 
 #else
 

-mp *mpmont_mul(mpmont *mm, mp *d, mp *a, mp *b)
+mp *mpmont_mul(const mpmont *mm, mp *d, mp *a, mp *b)

 {
   size_t n = mm->n;
 
 {
   size_t n = mm->n;
 

diff --git a/math/mpmont.h b/math/mpmont.h
index b0c119af8b04b978980b0172826644c90bdb11f3..cd1d39992519e553eca4e4adce84f1ae8f9daa39 100644 (file)
--- a/math/mpmont.h
+++ b/math/mpmont.h
@@ -126,29 +126,29 @@ extern void mpmont_destroy(mpmont */*mm*/);
 
 /* --- @mpmont_reduce@ --- *
  *
 
 /* --- @mpmont_reduce@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = destination
  *             @mp *a@ = source, assumed positive
  *
  * Returns:    Result, %$a R^{-1} \bmod m$%.
  */
 
  *             @mp *d@ = destination
  *             @mp *a@ = source, assumed positive
  *
  * Returns:    Result, %$a R^{-1} \bmod m$%.
  */
 

-extern mp *mpmont_reduce(mpmont */*mm*/, mp */*d*/, mp */*a*/);
+extern mp *mpmont_reduce(const mpmont */*mm*/, mp */*d*/, mp */*a*/);

 
 /* --- @mpmont_mul@ --- *
  *
 
 /* --- @mpmont_mul@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = destination
  *             @mp *a, *b@ = sources, assumed positive
  *
  * Returns:    Result, %$a b R^{-1} \bmod m$%.
  */
 
  *             @mp *d@ = destination
  *             @mp *a, *b@ = sources, assumed positive
  *
  * Returns:    Result, %$a b R^{-1} \bmod m$%.
  */
 

-extern mp *mpmont_mul(mpmont */*mm*/, mp */*d*/, mp */*a*/, mp */*b*/);
+extern mp *mpmont_mul(const mpmont */*mm*/, mp */*d*/, mp */*a*/, mp */*b*/);

 
 /* --- @mpmont_expr@ --- *
  *
 
 /* --- @mpmont_expr@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -157,11 +157,12 @@ extern mp *mpmont_mul(mpmont */*mm*/, mp */*d*/, mp */*a*/, mp */*b*/);
  *             further modular arithmetic is to be performed on the result.
  */
 
  *             further modular arithmetic is to be performed on the result.
  */
 

-extern mp *mpmont_expr(mpmont */*mm*/, mp */*d*/, mp */*a*/, mp */*e*/);
+extern mp *mpmont_expr(const mpmont */*mm*/, mp */*d*/,
+                      mp */*a*/, mp */*e*/);

 
 /* --- @mpmont_exp@ --- *
  *
 
 /* --- @mpmont_exp@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -169,11 +170,11 @@ extern mp *mpmont_expr(mpmont */*mm*/, mp */*d*/, mp */*a*/, mp */*e*/);
  * Returns:    Result, %$a^e \bmod m$%.
  */
 
  * Returns:    Result, %$a^e \bmod m$%.
  */
 

-extern mp *mpmont_exp(mpmont */*mm*/, mp */*d*/, mp */*a*/, mp */*e*/);
+extern mp *mpmont_exp(const mpmont */*mm*/, mp */*d*/, mp */*a*/, mp */*e*/);

 
 /* --- @mpmont_mexpr@ --- *
  *
 
 /* --- @mpmont_mexpr@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied
  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied


@@ -188,12 +189,12 @@ extern mp *mpmont_exp(mpmont */*mm*/, mp */*d*/, mp */*a*/, mp */*e*/);
  *             except that the %$g_i$% and result are in Montgomery form.
  */
 
  *             except that the %$g_i$% and result are in Montgomery form.
  */
 

-extern mp *mpmont_mexpr(mpmont */*mm*/, mp */*d*/,
+extern mp *mpmont_mexpr(const mpmont */*mm*/, mp */*d*/,

                        const mp_expfactor */*f*/, size_t /*n*/);
 
 /* --- @mpmont_mexp@ --- *
  *
                        const mp_expfactor */*f*/, size_t /*n*/);
 
 /* --- @mpmont_mexp@ --- *
  *

- * Arguments:  @mpmont *mm@ = pointer to Montgomery reduction context
+ * Arguments:  @const mpmont *mm@ = pointer to Montgomery reduction context

  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied
  *             @mp *d@ = fake destination
  *             @const mp_expfactor *f@ = pointer to array of factors
  *             @size_t n@ = number of factors supplied


@@ -203,7 +204,7 @@ extern mp *mpmont_mexpr(mpmont */*mm*/, mp */*d*/,
  * Use:                Convenient interface over @mpmont_mexpr@.
  */
 
  * Use:                Convenient interface over @mpmont_mexpr@.
  */
 

-extern mp *mpmont_mexp(mpmont */*mm*/, mp */*d*/,
+extern mp *mpmont_mexp(const mpmont */*mm*/, mp */*d*/,

                       const mp_expfactor */*f*/, size_t /*n*/);
 
 /*----- That's all, folks -------------------------------------------------*/
                       const mp_expfactor */*f*/, size_t /*n*/);
 
 /*----- That's all, folks -------------------------------------------------*/

diff --git a/math/mpreduce.c b/math/mpreduce.c
index 871d3a42826c6928a4b737eac18be79f4e851f0f..0fd4b458714bf877ad25c9ce7aea7d62f8b379cf 100644 (file)
--- a/math/mpreduce.c
+++ b/math/mpreduce.c
@@ -295,7 +295,7 @@ void mpreduce_destroy(mpreduce *r)
 
 /* --- @mpreduce_dump@ --- *
  *
 
 /* --- @mpreduce_dump@ --- *
  *

- * Arguments:  @mpreduce *r@ = structure to dump
+ * Arguments:  @const mpreduce *r@ = structure to dump

  *             @FILE *fp@ = file to dump on
  *
  * Returns:    ---
  *             @FILE *fp@ = file to dump on
  *
  * Returns:    ---


@@ -303,7 +303,7 @@ void mpreduce_destroy(mpreduce *r)
  * Use:                Dumps a reduction context.
  */
 
  * Use:                Dumps a reduction context.
  */
 

-void mpreduce_dump(mpreduce *r, FILE *fp)
+void mpreduce_dump(const mpreduce *r, FILE *fp)

 {
   size_t i;
   static const char *opname[] = { "add", "addshift", "sub", "subshift" };
 {
   size_t i;
   static const char *opname[] = { "add", "addshift", "sub", "subshift" };


@@ -331,7 +331,7 @@ void mpreduce_dump(mpreduce *r, FILE *fp)
 
 /* --- @mpreduce_do@ --- *
  *
 
 /* --- @mpreduce_do@ --- *
  *

- * Arguments:  @mpreduce *r@ = reduction context
+ * Arguments:  @const mpreduce *r@ = reduction context

  *             @mp *d@ = destination
  *             @mp *x@ = source
  *
  *             @mp *d@ = destination
  *             @mp *x@ = source
  *


@@ -353,7 +353,7 @@ static void run(const mpreduce_instr *i, const mpreduce_instr *il,
   }
 }
 
   }
 }
 

-mp *mpreduce_do(mpreduce *r, mp *d, mp *x)
+mp *mpreduce_do(const mpreduce *r, mp *d, mp *x)

 {
   mpw *v, *vl;
   const mpreduce_instr *il;
 {
   mpw *v, *vl;
   const mpreduce_instr *il;


@@ -410,7 +410,7 @@ mp *mpreduce_do(mpreduce *r, mp *d, mp *x)
 
 /* --- @mpreduce_exp@ --- *
  *
 
 /* --- @mpreduce_exp@ --- *
  *

- * Arguments:  @mpreduce *mr@ = pointer to reduction context
+ * Arguments:  @const mpreduce *mr@ = pointer to reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -418,7 +418,7 @@ mp *mpreduce_do(mpreduce *r, mp *d, mp *x)
  * Returns:    Result, %$a^e \bmod m$%.
  */
 
  * Returns:    Result, %$a^e \bmod m$%.
  */
 

-mp *mpreduce_exp(mpreduce *mr, mp *d, mp *a, mp *e)
+mp *mpreduce_exp(const mpreduce *mr, mp *d, mp *a, mp *e)

 {
   mp *x = MP_ONE;
   mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;
 {
   mp *x = MP_ONE;
   mp *spare = (e->f & MP_BURN) ? MP_NEWSEC : MP_NEW;

diff --git a/math/mpreduce.h b/math/mpreduce.h
index efac88f710227badfada669720e7e93f8c011a83..b6eb2d7cfc895bb177db969c27e183277fc34e00 100644 (file)
--- a/math/mpreduce.h
+++ b/math/mpreduce.h
@@ -93,7 +93,7 @@ extern void mpreduce_destroy(mpreduce */*r*/);
 
 /* --- @mpreduce_dump@ --- *
  *
 
 /* --- @mpreduce_dump@ --- *
  *

- * Arguments:  @mpreduce *r@ = structure to dump
+ * Arguments:  @const mpreduce *r@ = structure to dump

  *             @FILE *fp@ = file to dump on
  *
  * Returns:    ---
  *             @FILE *fp@ = file to dump on
  *
  * Returns:    ---


@@ -101,7 +101,7 @@ extern void mpreduce_destroy(mpreduce */*r*/);
  * Use:                Dumps a reduction context.
  */
 
  * Use:                Dumps a reduction context.
  */
 

-extern void mpreduce_dump(mpreduce */*r*/, FILE */*fp*/);
+extern void mpreduce_dump(const mpreduce */*r*/, FILE */*fp*/);

 
 /* --- @mpreduce_do@ --- *
  *
 
 /* --- @mpreduce_do@ --- *
  *


@@ -112,11 +112,11 @@ extern void mpreduce_dump(mpreduce */*r*/, FILE */*fp*/);
  * Returns:    Destination, @x@ reduced modulo the reduction poly.
  */
 
  * Returns:    Destination, @x@ reduced modulo the reduction poly.
  */
 

-extern mp *mpreduce_do(mpreduce */*r*/, mp */*d*/, mp */*x*/);
+extern mp *mpreduce_do(const mpreduce */*r*/, mp */*d*/, mp */*x*/);

 
 /* --- @mpreduce_exp@ --- *
  *
 
 /* --- @mpreduce_exp@ --- *
  *

- * Arguments:  @mpreduce *mr@ = pointer to reduction context
+ * Arguments:  @const mpreduce *mr@ = pointer to reduction context

  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent
  *             @mp *d@ = fake destination
  *             @mp *a@ = base
  *             @mp *e@ = exponent


@@ -124,7 +124,8 @@ extern mp *mpreduce_do(mpreduce */*r*/, mp */*d*/, mp */*x*/);
  * Returns:    Result, %$a^e \bmod m$%.
  */
 
  * Returns:    Result, %$a^e \bmod m$%.
  */
 

-extern mp *mpreduce_exp(mpreduce */*mr*/, mp */*d*/, mp */*a*/, mp */*e*/);
+extern mp *mpreduce_exp(const mpreduce */*mr*/, mp */*d*/,
+                       mp */*a*/, mp */*e*/);

 
 /*----- That's all, folks -------------------------------------------------*/
 
 
 /*----- That's all, folks -------------------------------------------------*/