This cleans up a number of
printf(...)
mpz_out_str(stdout, 10/16, var);
printf(...);
and replaces them with
gmp_printf(...%Zd..., var);
In tests/mpz/t-scan.c
"0x" was replaced with "%XZX which is "0X"
In tests/rand/statlib.c (tests/rand/statlib and findlc seem to not compile)
I added a space to align "hp =" and "h ="
This is the easiest cases, if it get's the okay I'll fix the rest (mostly
gmp_fprintf(stderr))
diff -r 805304ca965a tests/mpq/t-set_f.c
--- a/tests/mpq/t-set_f.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpq/t-set_f.c Wed Mar 25 18:14:50 2020 -0700
@@ -139,19 +139,11 @@
mpf_out_str (stdout, 16, 0, f);
printf ("\n");
- printf (" want num 0x");
- mpz_out_str (stdout, 16, want_num);
- printf ("\n");
- printf (" want den 0x");
- mpz_out_str (stdout, 16, want_den);
- printf ("\n");
+ gmp_printf (" want num %xZx\n", want_num);
+ gmp_printf (" want den %xZx\n", want_den);
- printf (" got num 0x");
- mpz_out_str (stdout, 16, mpq_numref(got));
- printf ("\n");
- printf (" got den 0x");
- mpz_out_str (stdout, 16, mpq_denref(got));
- printf ("\n");
+ gmp_printf (" got num %xZx\n", mpq_numref(got));
+ gmp_printf (" got den %xZx\n", mpq_denref(got));
abort ();
}
diff -r 805304ca965a tests/mpz/t-bin.c
--- a/tests/mpz/t-bin.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-bin.c Wed Mar 25 18:14:50 2020 -0700
@@ -36,10 +36,10 @@
if (mpz_cmp (got, want) != 0)
{
printf ("mpz_bin_ui wrong\n");
- printf (" n="); mpz_out_str (stdout, 10, n); printf ("\n");
+ gmp_printf (" n=%Zd\n", n);
printf (" k=%lu\n", k);
- printf (" got="); mpz_out_str (stdout, 10, got); printf ("\n");
- printf (" want="); mpz_out_str (stdout, 10, want); printf ("\n");
+ gmp_printf (" got=%Zd\n", got);
+ gmp_printf (" want=%Zd\n", want);
abort();
}
mpz_clear (got);
@@ -59,8 +59,8 @@
printf ("mpz_bin_uiui wrong\n");
printf (" n=%lu\n", n);
printf (" k=%lu\n", k);
- printf (" got="); mpz_out_str (stdout, 10, got); printf ("\n");
- printf (" want="); mpz_out_str (stdout, 10, want); printf ("\n");
+ gmp_printf (" got=%Zd\n", got);
+ gmp_printf (" want=%Zd\n", want);
abort();
}
mpz_clear (got);
diff -r 805304ca965a tests/mpz/t-bit.c
--- a/tests/mpz/t-bit.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-bit.c Wed Mar 25 18:14:50 2020 -0700
@@ -382,7 +382,7 @@
fail:
printf ("%s\n", s);
printf ("bitindex = %lu\n", bitindex);
- printf ("x = "); mpz_out_str (stdout, -16, x); printf (" hex\n");
+ gmp_printf ("x = %ZX hex\n", x);
exit (1);
}
diff -r 805304ca965a tests/mpz/t-cmp_si.c
--- a/tests/mpz/t-cmp_si.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-cmp_si.c Wed Mar 25 18:14:50 2020 -0700
@@ -75,7 +75,7 @@
if (SGN (got) != data[i].want)
{
printf ("mpz_cmp_si wrong on data[%d]\n", i);
- printf (" a="); mpz_out_str (stdout, 10, a); printf ("\n");
+ gmp_printf (" a=%Zd\n", a);
printf (" b=%ld\n", b);
printf (" got=%d\n", got);
printf (" want=%d\n", data[i].want);
diff -r 805304ca965a tests/mpz/t-fac_ui.c
--- a/tests/mpz/t-fac_ui.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-fac_ui.c Wed Mar 25 18:14:50 2020 -0700
@@ -61,8 +61,8 @@
if (mpz_cmp (f, r) != 0)
{
printf ("mpz_fac_ui(%lu) wrong\n", n);
- printf (" got "); mpz_out_str (stdout, 10, r); printf("\n");
- printf (" want "); mpz_out_str (stdout, 10, f); printf("\n");
+ gmp_printf (" got %Zd\n", r);
+ gmp_printf (" want %Zd\n", f);
abort ();
}
diff -r 805304ca965a tests/mpz/t-fits.c
--- a/tests/mpz/t-fits.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-fits.c Wed Mar 25 18:14:50 2020 -0700
@@ -33,8 +33,8 @@
{ \
printf ("%s (%s) got %d want %d\n", name, expr, got, answer); \
printf (" z size %d\n", SIZ(z)); \
- printf (" z dec "); mpz_out_str (stdout, 10, z); printf ("\n"); \
- printf (" z hex "); mpz_out_str (stdout, 16, z); printf ("\n"); \
+ gmp_printf (" z dec %Zd\n", z); \
+ gmp_printf (" z hex %Zx\n", z); \
error = 1; \
}
diff -r 805304ca965a tests/mpz/t-get_si.c
--- a/tests/mpz/t-get_si.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-get_si.c Wed Mar 25 18:14:50 2020 -0700
@@ -52,9 +52,7 @@
if (got != data[i].want)
{
printf ("mpz_get_si wrong at data[%d]\n", i);
- printf (" n \"%s\" (", data[i].n);
- mpz_out_str (stdout, 10, n); printf (", hex ");
- mpz_out_str (stdout, 16, n); printf (")\n");
+ gmp_printf (" n \"%s\" (%Zd, hex %Zx)\n", data[i].n, n, n);
printf (" got %ld (0x%lX)\n", got, got);
printf (" want %ld (0x%lX)\n", data[i].want, data[i].want);
abort();
diff -r 805304ca965a tests/mpz/t-jac.c
--- a/tests/mpz/t-jac.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-jac.c Wed Mar 25 18:14:50 2020 -0700
@@ -103,9 +103,8 @@
got = mpz_kronecker_ui (a, b);
if (got != answer)
{
- printf ("mpz_kronecker_ui (");
- mpz_out_str (stdout, 10, a);
- printf (", %lu) is %d should be %d\n", b, got, answer);
+ gmp_printf ("mpz_kronecker_ui (%Zd, %lu) is %d should be %d\n",
+ a, b, got, answer);
abort ();
}
}
@@ -119,9 +118,8 @@
got = mpz_kronecker_si (a, b);
if (got != answer)
{
- printf ("mpz_kronecker_si (");
- mpz_out_str (stdout, 10, a);
- printf (", %ld) is %d should be %d\n", b, got, answer);
+ gmp_printf ("mpz_kronecker_si (%Zd, %lu) is %d should be %d\n",
+ a, b, got, answer);
abort ();
}
}
diff -r 805304ca965a tests/mpz/t-mfac_uiui.c
--- a/tests/mpz/t-mfac_uiui.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-mfac_uiui.c Wed Mar 25 18:14:50 2020 -0700
@@ -66,8 +66,8 @@
if (mpz_cmp (ref[m], res) != 0)
{
printf ("mpz_mfac_uiui(%lu,%d) wrong\n", n, MULTIFAC_WHEEL);
- printf (" got "); mpz_out_str (stdout, 10, res); printf("\n");
- printf (" want "); mpz_out_str (stdout, 10, ref[m]); printf("\n");
+ gmp_printf (" got %Zd\n", res);
+ gmp_printf (" want %Zd\n", ref[m]);
abort ();
}
mpz_mfac_uiui (res, n, MULTIFAC_WHEEL2);
@@ -75,8 +75,8 @@
if (mpz_cmp (ref2[m2], res) != 0)
{
printf ("mpz_mfac_uiui(%lu,%d) wrong\n", n, MULTIFAC_WHEEL2);
- printf (" got "); mpz_out_str (stdout, 10, res); printf("\n");
- printf (" want "); mpz_out_str (stdout, 10, ref2[m2]); printf("\n");
+ gmp_printf (" got %Zd\n", res);
+ gmp_printf (" want %Zd\n", ref2[m2]);
abort ();
}
if (n + step <= limit)
@@ -95,8 +95,8 @@
if (mpz_cmp (ref[0], res) != 0)
{
printf ("mpz_mfac_uiui(%lu,1) wrong\n", n);
- printf (" got "); mpz_out_str (stdout, 10, res); printf("\n");
- printf (" want "); mpz_out_str (stdout, 10, ref[0]); printf("\n");
+ gmp_printf (" got %Zd\n", res);
+ gmp_printf (" want %Zd\n", ref[0]);
abort ();
}
diff -r 805304ca965a tests/mpz/t-popcount.c
--- a/tests/mpz/t-popcount.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-popcount.c Wed Mar 25 18:14:50 2020 -0700
@@ -79,8 +79,8 @@
{
printf ("mpz_popcount wrong at data[%d]\n", i);
printf (" n \"%s\"\n", data[i].n);
- printf (" "); mpz_out_str (stdout, 10, n); printf ("\n");
- printf (" 0x"); mpz_out_str (stdout, 16, n); printf ("\n");
+ gmp_printf (" %Zd\n", n);
+ gmp_printf (" %xZx\n", n);
printf (" got %lu\n", got);
printf (" want %lu\n", data[i].want);
abort ();
@@ -142,8 +142,8 @@
if (got != ref)
{
printf ("mpz_popcount wrong on random\n");
- printf (" "); mpz_out_str (stdout, 10, arg); printf ("\n");
- printf (" 0x"); mpz_out_str (stdout, 16, arg); printf ("\n");
+ gmp_printf (" %Zd\n", arg);
+ gmp_printf (" %xZx\n", arg);
printf (" got %lu\n", got);
printf (" want %lu\n", ref);
abort ();
diff -r 805304ca965a tests/mpz/t-primorial_ui.c
--- a/tests/mpz/t-primorial_ui.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-primorial_ui.c Wed Mar 25 18:14:50 2020 -0700
@@ -63,8 +63,8 @@
if (mpz_cmp (f, r) != 0)
{
printf ("mpz_primorial_ui(%lu) wrong\n", n);
- printf (" got "); mpz_out_str (stdout, 10, r); printf("\n");
- printf (" want "); mpz_out_str (stdout, 10, f); printf("\n");
+ gmp_printf (" got %Zd\n", r);
+ gmp_printf (" want %Zd\n", f);
abort ();
}
diff -r 805304ca965a tests/mpz/t-scan.c
--- a/tests/mpz/t-scan.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/mpz/t-scan.c Wed Mar 25 18:14:50 2020 -0700
@@ -103,9 +103,7 @@
{
printf ("wrong at test=%d, size=%ld, neg=%d, start=%lu, sought=%d\n",
test, size, neg, start, sought);
- printf (" z 0x");
- mpz_out_str (stdout, -16, z);
- printf ("\n");
+ gmp_printf (" z %XZX\n", z);
printf (" got=%lu, want=%lu\n", got, want);
exit (1);
}
diff -r 805304ca965a tests/rand/statlib.c
--- a/tests/rand/statlib.c Tue Mar 24 23:13:28 2020 +0100
+++ b/tests/rand/statlib.c Wed Mar 25 18:14:50 2020 -0700
@@ -548,18 +548,13 @@
mpz_sub (tmp1, tmp1, tmp2);
if (mpz_cmpabs (m, tmp1))
{
- printf ("***BUG***: h*pp - hp*p = ");
- mpz_out_str (stdout, 10, tmp1);
- printf ("\n");
+ gmp_printf ("***BUG***: h*pp - hp*p = %Zd\n", tmp1);
}
}
if (g_debug > DEBUG_2)
{
- printf ("hp = ");
- mpz_out_str (stdout, 10, hp);
- printf ("\nh = ");
- mpz_out_str (stdout, 10, h);
- printf ("\n");
+ gmp_printf ("hp = %Zd\n", hp);
+ gmp_printf ("h = %Zd\n", h);
fflush (stdout);
}
@@ -570,9 +565,7 @@
if (g_debug > DEBUG_2)
{
- printf ("q = ");
- mpz_out_str (stdout, 10, q);
- printf ("\n");
+ gmp_printf ("q = %Zd\n", q);
fflush (stdout);
}
@@ -694,8 +687,7 @@
zdiv_round (q, tmp1, tmp3); /* q=round(Vi.Vj/Vj.Vj) */
if (g_debug > DEBUG_2)
{
- printf (", ");
- mpz_out_str (stdout, 10, q);
+ gmp_printf (", %Zd", q);
}
for (ui_l = 0; ui_l <= ui_t; ui_l++)
@@ -764,11 +756,8 @@
{
if (g_debug > DEBUG_2)
{
- printf ("X[%u] = ", ui_k);
- mpz_out_str (stdout, 10, X[ui_k]);
- printf ("\tZ[%u] = ", ui_k);
- mpz_out_str (stdout, 10, Z[ui_k]);
- printf ("\n");
+ gmp_printf ("X[%u] = %Zd\tZ[%u] = %Zd\n",
+ ui_k, X[ui_k], ui_k, Z[ui_k]);
fflush (stdout);
}
_______________________________________________
gmp-devel mailing list
gmp-devel@gmplib.org
https://gmplib.org/mailman/listinfo/gmp-devel
