forked from pool/alsa-utils
Takashi Iwai
7200ea9d85
- Backport upstream patches: A few portability fixes, alsaucm fixes and extensions, alsatplg minor fixes, alsa-info.sh extensions: 0001-treewide-sys-poll-to-poll.patch 0002-treewide-Fix-wrong-formats-on-32-bit.patch 0003-treewide-Fix-printf-formats.patch 0004-aplay-Adjust-buffer-sizes-to-fix-snprintf-warnings.patch 0005-aplay-Limit-VUMeter-progress-bar-to-100-for-negative.patch 0006-alsactl-sysfs-add-sys-kernel-uevent_seqnum-check-to-.patch 0007-alsaucm-use-the-first-sound-card-use-case-name-hw-CA.patch 0008-alsaucm-add-text-dump-command.patch 0009-alsaucm-add-json-dump-command.patch 0010-alsaucm-dump-fix-the-prefixed.patch 0011-alsactl-fix-sched-idle-set-it-really-to-SCHED_IDLE.patch 0012-configure-Fix-linking-of-alsatplg-with-the-older-lib.patch 0013-alsatplg-add-n-normalize-option.patch 0014-alsatplg-add-s-sort-and-fix-memory-leaks.patch 0015-alsatplg-fix-another-small-leak-in-normalize_config.patch 0016-alsa-info.sh-Consolidate-PCI-device-output.patch 0017-alsa-info.sh-Read-from-proc-modules-and-sort-the-res.patch 0018-alsa-info.sh-Simplify-iteration-over-cards-when-call.patch 0019-alsa-info.sh-Use-existing-function-to-print-ALSA-con.patch 0020-alsa-info.sh-Exit-script-after-writing-information-t.patch 0021-alsa-info.sh-Replace-gauge-with-infobox-for-upload-d.patch 0022-alsa-info.sh-Remove-progress-spinner-during-upload-w.patch 0023-alsa-info.sh-Condense-nested-commands-for-file-uploa.patch 0024-alsa-info.sh-Condense-nested-commands-for-formatting.patch 0025-alsa-info.sh-Perform-test-for-wget-earlier.patch 0026-alsa-info.sh-Warn-after-actual-upload-failure-do-not.patch OBS-URL: https://build.opensuse.org/request/show/766332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=165
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
From 66e9a816093c7d8fbdfbc407062daabe89825b35 Mon Sep 17 00:00:00 2001
|
|
From: Rosen Penev <rosenp@gmail.com>
|
|
Date: Tue, 19 Nov 2019 20:28:54 -0800
|
|
Subject: [PATCH 02/26] 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>
|
|
---
|
|
axfer/container.c | 7 ++++---
|
|
axfer/subcmd-transfer.c | 4 +++-
|
|
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/axfer/container.c b/axfer/container.c
|
|
index 7da97c671927..566acd058636 100644
|
|
--- a/axfer/container.c
|
|
+++ b/axfer/container.c
|
|
@@ -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);
|
|
}
|
|
|
|
diff --git a/axfer/subcmd-transfer.c b/axfer/subcmd-transfer.c
|
|
index 3ca745a6d7a1..8746e6f494d2 100644
|
|
--- a/axfer/subcmd-transfer.c
|
|
+++ b/axfer/subcmd-transfer.c
|
|
@@ -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) {
|
|
--
|
|
2.16.4
|
|
|