]> git.alsa-project.org Git - alsa-utils.git/commitdiff
treewide: Fix wrong formats on 32-bit
authorRosen Penev <rosenp@gmail.com>
Wed, 20 Nov 2019 04:28:54 +0000 (20:28 -0800)
committerTakashi Iwai <tiwai@suse.de>
Wed, 20 Nov 2019 18:45:57 +0000 (19:45 +0100)
uint64_t evaluates to unsigned long long on 32-bit, not unsigned long.
Use the proper formats.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
axfer/container.c
axfer/subcmd-transfer.c

index 7da97c671927970515f5a10fb822bb1b9d2ad6a4..566acd0586360d3c4ac6cd1403ebf329b523cb40 100644 (file)
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <string.h>
 #include <fcntl.h>
+#include <inttypes.h>
 
 static const char *const cntr_type_labels[] = {
        [CONTAINER_TYPE_PARSER] = "parser",
@@ -356,10 +357,10 @@ int container_context_pre_process(struct container_context *cntr,
                fprintf(stderr, "  frames/second: %u\n",
                        cntr->frames_per_second);
                if (cntr->type == CONTAINER_TYPE_PARSER) {
-                       fprintf(stderr, "  frames: %lu\n",
+                       fprintf(stderr, "  frames: %" PRIu64 "\n",
                                *frame_count);
                } else {
-                       fprintf(stderr, "  max frames: %lu\n",
+                       fprintf(stderr, "  max frames: %" PRIu64 "\n",
                                *frame_count);
                }
        }
@@ -427,7 +428,7 @@ int container_context_post_process(struct container_context *cntr,
        assert(frame_count);
 
        if (cntr->verbose && cntr->handled_byte_count > 0) {
-               fprintf(stderr, "  Handled bytes: %lu\n",
+               fprintf(stderr, "  Handled bytes: %" PRIu64 "\n",
                        cntr->handled_byte_count);
        }
 
index 3ca745a6d7a1b153501127a10fd4ff3a218a91e5..8746e6f494d239e6f9e5fdfae329b436a79f0df8 100644 (file)
@@ -11,6 +11,7 @@
 #include "misc.h"
 
 #include <signal.h>
+#include <inttypes.h>
 
 struct context {
        struct xfer_context xfer;
@@ -389,7 +390,8 @@ static int context_process_frames(struct context *ctx,
 
        if (!ctx->xfer.quiet) {
                fprintf(stderr,
-                       "%s: Expected %lu frames, Actual %lu frames\n",
+                       "%s: Expected %" PRIu64 "frames, "
+                       "Actual %" PRIu64 "frames\n",
                        snd_pcm_stream_name(direction), expected_frame_count,
                        *actual_frame_count);
                if (ctx->interrupted) {