From 6143bc67d7dece48d859c373c904d6388b2b8370 Mon Sep 17 00:00:00 2001 From: vlefevre Date: Tue, 2 Jul 2019 11:39:38 +0000 Subject: [tests/*.c] Added missing "const" qualifier to "char *" when this involves string literals (detected by using GCC's -Wwrite-strings option, via the default -Wdiscarded-qualifiers warning). (merged changeset r13515 from the trunk) git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/4.0@13516 280ebfd0-de03-0410-8827-d642c229c3f4 --- tests/tdiv.c | 2 +- tests/tfpif.c | 8 ++++---- tests/tmul_2exp.c | 2 +- tests/trandom.c | 2 +- tests/trint.c | 2 +- tests/tsum.c | 12 ++++++++---- tests/turandom.c | 2 +- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tests/tdiv.c b/tests/tdiv.c index b9f5e2b9a..303cd52f3 100644 --- a/tests/tdiv.c +++ b/tests/tdiv.c @@ -23,7 +23,7 @@ https://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., #include "mpfr-test.h" static void -check_equal (mpfr_srcptr a, mpfr_srcptr a2, char *s, +check_equal (mpfr_srcptr a, mpfr_srcptr a2, const char *s, mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t r) { if (SAME_VAL (a, a2)) diff --git a/tests/tfpif.c b/tests/tfpif.c index 4eac120bc..391080167 100644 --- a/tests/tfpif.c +++ b/tests/tfpif.c @@ -30,8 +30,8 @@ https://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., static void doit (int argc, char *argv[], mpfr_prec_t p1, mpfr_prec_t p2) { - char *filenameCompressed = FILE_NAME_RW; - char *data = FILE_NAME_R; + const char *filenameCompressed = FILE_NAME_RW; + const char *data = FILE_NAME_R; int status; FILE *fh; mpfr_t x[9]; @@ -198,7 +198,7 @@ doit (int argc, char *argv[], mpfr_prec_t p1, mpfr_prec_t p2) static void check_bad (void) { - char *filenameCompressed = FILE_NAME_RW; + const char *filenameCompressed = FILE_NAME_RW; int status; FILE *fh; mpfr_t x; @@ -340,7 +340,7 @@ check_bad (void) static void extra (void) { - char *data = FILE_NAME_R2; + const char *data = FILE_NAME_R2; mpfr_t x; FILE *fp; int ret; diff --git a/tests/tmul_2exp.c b/tests/tmul_2exp.c index cd3ac6b3c..961bbc2d9 100644 --- a/tests/tmul_2exp.c +++ b/tests/tmul_2exp.c @@ -258,7 +258,7 @@ overflow0 (mpfr_exp_t emax) mpfr_exp_t old_emax; mpfr_t x, y1, y2; int neg, r, op; - static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" }; + static const char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" }; old_emax = mpfr_get_emax (); set_emax (emax); diff --git a/tests/trandom.c b/tests/trandom.c index 3503e78c4..f1172b1d3 100644 --- a/tests/trandom.c +++ b/tests/trandom.c @@ -185,7 +185,7 @@ main (int argc, char *argv[]) { gmp_randstate_t s; mpfr_t x; - char *str = "0.1010111100000000000000000000000000000000E-32"; + const char *str = "0.1010111100000000000000000000000000000000E-32"; int k; gmp_randinit_default (s); diff --git a/tests/trint.c b/tests/trint.c index fd2a45ca2..1aa701a57 100644 --- a/tests/trint.c +++ b/tests/trint.c @@ -308,7 +308,7 @@ basic_tests (void) #if __MPFR_STDC (199901L) static void -test_fct (double (*f)(double), int (*g)(), char *s, mpfr_rnd_t r) +test_fct (double (*f)(double), int (*g)(), const char *s, mpfr_rnd_t r) { double d, y; mpfr_t dd, yy; diff --git a/tests/tsum.c b/tests/tsum.c index a46f8363c..a7ec22996 100644 --- a/tests/tsum.c +++ b/tests/tsum.c @@ -285,7 +285,7 @@ void check_special (void) static void check_more_special (void) { - char *str[NC] = { "NaN", "+Inf", "-Inf", "+0", "-0", "+1", "-1" }; + const char *str[NC] = { "NaN", "+Inf", "-Inf", "+0", "-0", "+1", "-1" }; int i, r, k[NS]; mpfr_t c[NC], s[NS], sum; mpfr_ptr p[NS]; @@ -724,7 +724,7 @@ bug20131027 (void) { mpfr_t sum, t[4]; mpfr_ptr p[4]; - char *s[4] = { + const char *s[4] = { "0x1p1000", "-0x0.fffffffffffff80000000000000001p1000", "-0x1p947", @@ -771,7 +771,11 @@ bug20150327 (void) { mpfr_t sum1, sum2, t[3]; mpfr_ptr p[3]; - char *s[3] = { "0.10000111110101000010101011100001", "1E-100", "0.1E95" }; + const char *s[3] = { + "0.10000111110101000010101011100001", + "1E-100", + "0.1E95" + }; int i, r; mpfr_inits2 (58, sum1, sum2, (mpfr_ptr) 0); @@ -1268,7 +1272,7 @@ bug20160315 (void) { mpfr_t r, t[4]; mpfr_ptr p[4]; - char *s[4] = { "0.10E20", "0", "0.11E382", "0.10E826" }; + const char *s[4] = { "0.10E20", "0", "0.11E382", "0.10E826" }; int i; mpfr_init2 (r, 2); diff --git a/tests/turandom.c b/tests/turandom.c index d23f939a2..3c733ae69 100644 --- a/tests/turandom.c +++ b/tests/turandom.c @@ -526,7 +526,7 @@ reprod_abi (void) #define N 6 /* Run this program with the MPFR_REPROD_ABI_OUTPUT environment variable set to get the array of strings. */ - char *t[5 * N] = { + const char *t[5 * N] = { "1.0@-1", "3.0@-1", "7.0@-1", -- cgit v1.2.1