varints: Fixed format strings.

diff --git a/ucw/ff-varint.c b/ucw/ff-varint.c
index 453a26f788c8a0a1bed6d59610dfa13c68a8b025..7a5d56648d06a133cfc38a35a80147a2c1a62a9d 100644 (file)
--- a/ucw/ff-varint.c
+++ b/ucw/ff-varint.c
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
        struct fastbuf *b = fbgrow_create(8);
        switch (func) {
                uns u;
-               u64 r;
+               uintmax_t r;
                int i;
                case FUNC_BGET_VARINT:
                        while (scanf("%x", &u) == 1)
@@ -78,14 +78,14 @@ int main(int argc, char **argv)
                                if (btell(b))
                                        putchar(' ');
                                r = bget_varint_slow(b, ~0LLU);
-                               printf("%lx", r);
+                               printf("%jx", r);
                        }
                        putchar('\n');
                        break;
 
                case FUNC_BPUT_VARINT:
                        i = 0;
-                       while (scanf("%lx", &r) == 1)
+                       while (scanf("%jx", &r) == 1)
                                bput_varint_slow(b, r);
                        fbgrow_rewind(b);
                        while (bpeekc(b) >= 0) {

diff --git a/ucw/varint.c b/ucw/varint.c
index 18debb14867811c6b7c90631f3db08ce906b0716..a88f4e3d32721968fb6323952e00a9dc75210d8f 100644 (file)
--- a/ucw/varint.c
+++ b/ucw/varint.c
@@ -86,13 +86,14 @@ const byte *varint_get_big(const byte *p, u64 *r)
 
 #include <string.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 int main(int argc, char **argv UNUSED)
 {
        byte buf[16] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa };
        u64 u;
 
-       if (scanf("%lx", &u) != 1) {
+       if (scanf("%"SCNx64, &u) != 1) {
                fprintf(stderr, "Invalid usage!\n");
                return 1;
        }