Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-alsa-utils: Commit

external/alsa-utils


Commit MetaInfo

Revisión66e9a816093c7d8fbdfbc407062daabe89825b35 (tree)
Tiempo2019-11-21 03:45:57
AutorRosen Penev <rosenp@gmai...>
CommiterTakashi Iwai

Log Message

treewide: Fix wrong formats on 32-bit

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>

Cambiar Resumen

Diferencia

--- a/axfer/container.c
+++ b/axfer/container.c
@@ -13,6 +13,7 @@
1313 #include <errno.h>
1414 #include <string.h>
1515 #include <fcntl.h>
16+#include <inttypes.h>
1617
1718 static const char *const cntr_type_labels[] = {
1819 [CONTAINER_TYPE_PARSER] = "parser",
@@ -356,10 +357,10 @@ int container_context_pre_process(struct container_context *cntr,
356357 fprintf(stderr, " frames/second: %u\n",
357358 cntr->frames_per_second);
358359 if (cntr->type == CONTAINER_TYPE_PARSER) {
359- fprintf(stderr, " frames: %lu\n",
360+ fprintf(stderr, " frames: %" PRIu64 "\n",
360361 *frame_count);
361362 } else {
362- fprintf(stderr, " max frames: %lu\n",
363+ fprintf(stderr, " max frames: %" PRIu64 "\n",
363364 *frame_count);
364365 }
365366 }
@@ -427,7 +428,7 @@ int container_context_post_process(struct container_context *cntr,
427428 assert(frame_count);
428429
429430 if (cntr->verbose && cntr->handled_byte_count > 0) {
430- fprintf(stderr, " Handled bytes: %lu\n",
431+ fprintf(stderr, " Handled bytes: %" PRIu64 "\n",
431432 cntr->handled_byte_count);
432433 }
433434
--- a/axfer/subcmd-transfer.c
+++ b/axfer/subcmd-transfer.c
@@ -11,6 +11,7 @@
1111 #include "misc.h"
1212
1313 #include <signal.h>
14+#include <inttypes.h>
1415
1516 struct context {
1617 struct xfer_context xfer;
@@ -389,7 +390,8 @@ static int context_process_frames(struct context *ctx,
389390
390391 if (!ctx->xfer.quiet) {
391392 fprintf(stderr,
392- "%s: Expected %lu frames, Actual %lu frames\n",
393+ "%s: Expected %" PRIu64 "frames, "
394+ "Actual %" PRIu64 "frames\n",
393395 snd_pcm_stream_name(direction), expected_frame_count,
394396 *actual_frame_count);
395397 if (ctx->interrupted) {
Show on old repository browser