From bb77b1d1f5d16f3e8fce3d15fc2d88eb0597346f Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 29 Jun 2013 00:23:07 +0100 Subject: [PATCH] Mollify various warnings which occur in 64-bit builds. --- math/ec-test.c | 5 +++-- math/group-test.c | 7 +++++-- math/mpbarrett-mexp.c | 4 ++-- math/mpcrt.c | 8 ++++---- math/mpmont-mexp.c | 4 ++-- progs/cc-progress.c | 3 ++- progs/rspit.c | 2 +- pub/gdsa.c | 7 +++++-- pub/gkcdsa.c | 7 +++++-- 9 files changed, 29 insertions(+), 18 deletions(-) diff --git a/math/ec-test.c b/math/ec-test.c index db59294..26daeef 100644 --- a/math/ec-test.c +++ b/math/ec-test.c @@ -137,7 +137,7 @@ static void ecvcvt(const char *buf, dstr *d) qd.e = 0; if ((v = ec_curveparse(&qd)) == 0) { fprintf(stderr, "bad curve `%.*s|%s': %s\n", - qd.p - buf, buf, qd.p, qd.e); + (int)(qd.p - buf), buf, qd.p, qd.e); exit(1); } dstr_ensure(d, sizeof(v)); @@ -165,7 +165,8 @@ static void eccvt(const char *p, dstr *d) d->len += sizeof(ec); ec_create(a); if (!ec_ptparse(&qd, a)) { - fprintf(stderr, "bad point `%.*s|%s': %s\n", qd.p - p, p, qd.p, qd.e); + fprintf(stderr, "bad point `%.*s|%s': %s\n", + (int)(qd.p - p), p, qd.p, qd.e); exit(1); } } diff --git a/math/group-test.c b/math/group-test.c index 8541b48..493ee2f 100644 --- a/math/group-test.c +++ b/math/group-test.c @@ -42,8 +42,11 @@ static group *getgroup(const char *p) { group *g; qd_parse qd; qd.p = p; qd.e = 0; g = group_parse(&qd); if (g && !qd_eofp(&qd)) { G_DESTROYGROUP(g); g = 0; qd.e = "junk at eof"; } - if (!g) { fprintf(stderr, "bad group string `%.*s|%s': %s\n", qd.p - p, - p, qd.p, qd.e); exit(1); } + if (!g) { + fprintf(stderr, "bad group string `%.*s|%s': %s\n", + (int)(qd.p - p), p, qd.p, qd.e); + exit(1); + } return (g); } diff --git a/math/mpbarrett-mexp.c b/math/mpbarrett-mexp.c index a221f10..ac1e16a 100644 --- a/math/mpbarrett-mexp.c +++ b/math/mpbarrett-mexp.c @@ -105,9 +105,9 @@ static int verify(size_t n, dstr *v) fputs("\n*** mexp failed\n", stderr); fputs("m = ", stderr); mp_writefile(m, stderr, 10); for (i = 0; i < n; i++) { - fprintf(stderr, "\ng_%u = ", i); + fprintf(stderr, "\ng_%lu = ", (unsigned long)i); mp_writefile(f[i].base, stderr, 10); - fprintf(stderr, "\ne_%u = ", i); + fprintf(stderr, "\ne_%lu = ", (unsigned long)i); mp_writefile(f[i].exp, stderr, 10); } fputs("\nr = ", stderr); mp_writefile(r, stderr, 10); diff --git a/math/mpcrt.c b/math/mpcrt.c index a8f805f..eedc534 100644 --- a/math/mpcrt.c +++ b/math/mpcrt.c @@ -221,13 +221,13 @@ static int verify(size_t n, dstr *v) fputs("n = ", stderr); mp_writefile(c.mb.m, stderr, 10); for (i = 0; i < n; i++) { - fprintf(stderr, "\nr[%u] = ", i); + fprintf(stderr, "\nr[%lu] = ", (unsigned long)i); mp_writefile(r[i], stderr, 10); - fprintf(stderr, "\nm[%u] = ", i); + fprintf(stderr, "\nm[%lu] = ", (unsigned long)i); mp_writefile(m[i].m, stderr, 10); - fprintf(stderr, "\nN[%u] = ", i); + fprintf(stderr, "\nN[%lu] = ", (unsigned long)i); mp_writefile(m[i].n, stderr, 10); - fprintf(stderr, "\nM[%u] = ", i); + fprintf(stderr, "\nM[%lu] = ", (unsigned long)i); mp_writefile(m[i].ni, stderr, 10); } fputs("\nresult = ", stderr); diff --git a/math/mpmont-mexp.c b/math/mpmont-mexp.c index e0f37b5..20a5f73 100644 --- a/math/mpmont-mexp.c +++ b/math/mpmont-mexp.c @@ -141,9 +141,9 @@ static int verify(size_t n, dstr *v) fputs("\n*** mexp failed\n", stderr); fputs("m = ", stderr); mp_writefile(m, stderr, 10); for (i = 0; i < n; i++) { - fprintf(stderr, "\ng_%u = ", i); + fprintf(stderr, "\ng_%lu = ", (unsigned long)i); mp_writefile(f[i].base, stderr, 10); - fprintf(stderr, "\ne_%u = ", i); + fprintf(stderr, "\ne_%lu = ", (unsigned long)i); mp_writefile(f[i].exp, stderr, 10); } fputs("\nr = ", stderr); mp_writefile(r, stderr, 10); diff --git a/progs/cc-progress.c b/progs/cc-progress.c index 903e80e..918eb2c 100644 --- a/progs/cc-progress.c +++ b/progs/cc-progress.c @@ -177,7 +177,8 @@ int fprogress_init(fprogress *f, const char *name, FILE *fp) void fprogress_clear(fprogress *f) { fprintf(stderr, "\r%*s\r", - sizeof(f->name) + 2*PRHUMAN_DATAWD + PRHUMAN_TIMEWD + BARWD + 16, + (int)(sizeof(f->name) + 2*PRHUMAN_DATAWD + + PRHUMAN_TIMEWD + BARWD + 16), ""); } diff --git a/progs/rspit.c b/progs/rspit.c index 1819a61..b75c6f8 100644 --- a/progs/rspit.c +++ b/progs/rspit.c @@ -1208,7 +1208,7 @@ static int generate(grand *r, size_t outsz, q >>= 10; kk++; } - fprintf(stderr, "%4i%c\r[", q, *kk); + fprintf(stderr, "%4i%c\r[", (int)q, *kk); if (outsz) { unsigned pc; for (pc = 0; pc < (percent & ~1); pc += 2) diff --git a/pub/gdsa.c b/pub/gdsa.c index 6fea5f4..6b985de 100644 --- a/pub/gdsa.c +++ b/pub/gdsa.c @@ -146,8 +146,11 @@ static group *getgroup(const char *p) { group *g; qd_parse qd; qd.p = p; qd.e = 0; g = group_parse(&qd); if (g && !qd_eofp(&qd)) { G_DESTROYGROUP(g); g = 0; qd.e = "junk at eof"; } - if (!g) { fprintf(stderr, "bad group string `%.*s|%s': %s\n", qd.p - p, - p, qd.p, qd.e); exit(1); } + if (!g) { + fprintf(stderr, "bad group string `%.*s|%s': %s\n", + (int)(qd.p - p), p, qd.p, qd.e); + exit(1); + } return (g); } diff --git a/pub/gkcdsa.c b/pub/gkcdsa.c index eb5a3de..52e91ba 100644 --- a/pub/gkcdsa.c +++ b/pub/gkcdsa.c @@ -187,8 +187,11 @@ static group *getgroup(const char *p) { group *g; qd_parse qd; qd.p = p; qd.e = 0; g = group_parse(&qd); if (g && !qd_eofp(&qd)) { G_DESTROYGROUP(g); g = 0; qd.e = "junk at eof"; } - if (!g) { fprintf(stderr, "bad group string `%.*s|%s': %s\n", qd.p - p, - p, qd.p, qd.e); exit(1); } + if (!g) { + fprintf(stderr, "bad group string `%.*s|%s': %s\n", + (int)(qd.p - p), p, qd.p, qd.e); + exit(1); + } return (g); } -- 2.11.0