asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 00:15:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

treewide: Fix printf formats

Browse source 
Found with cppcheck

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Rosen Penev 2019-11-19 20:28:55 -08:00 committed by Takashi Iwai
parent 66e9a81609
commit 80fd81f4a8
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alsactl/init_parse.c
View file

@ -187,7 +187,7 @@ static int init_space(struct space **space, int card)
return -ENOMEM; return -ENOMEM;
res->ctl_id_changed = ~0; res->ctl_id_changed = ~0;
res->linenum = -1; res->linenum = -1;
sprintf(device, "hw:%u", card); sprintf(device, "hw:%d", card);
err = snd_hctl_open(&res->ctl_handle, device, 0); err = snd_hctl_open(&res->ctl_handle, device, 0);
if (err < 0) if (err < 0)
goto error; goto error;
@ -734,7 +734,7 @@ dbvalue:
elem = snd_hctl_elem_next(elem); elem = snd_hctl_elem_next(elem);
} }
snd_ctl_elem_id_free(id); snd_ctl_elem_id_free(id);
sprintf(res, "%u", index); sprintf(res, "%d", index);
dbg("do_ctl_count found %s controls", res); dbg("do_ctl_count found %s controls", res);
return res; return res;
} }

10
alsaloop/pcmjob.c
View file

@ -120,7 +120,7 @@ static int setparams_stream(struct loopback_handle *lhandle,
} }
err = snd_pcm_hw_params_set_rate_resample(handle, params, lhandle->resample); err = snd_pcm_hw_params_set_rate_resample(handle, params, lhandle->resample);
if (err < 0) { if (err < 0) {
logit(LOG_CRIT, "Resample setup failed for %s (val %i): %s\n", lhandle->id, lhandle->resample, snd_strerror(err)); logit(LOG_CRIT, "Resample setup failed for %s (val %u): %s\n", lhandle->id, lhandle->resample, snd_strerror(err));
return err; return err;
} }
err = snd_pcm_hw_params_set_access(handle, params, lhandle->access); err = snd_pcm_hw_params_set_access(handle, params, lhandle->access);
@ -135,13 +135,13 @@ static int setparams_stream(struct loopback_handle *lhandle,
} }
err = snd_pcm_hw_params_set_channels(handle, params, lhandle->channels); err = snd_pcm_hw_params_set_channels(handle, params, lhandle->channels);
if (err < 0) { if (err < 0) {
logit(LOG_CRIT, "Channels count (%i) not available for %s: %s\n", lhandle->channels, lhandle->id, snd_strerror(err)); logit(LOG_CRIT, "Channels count (%u) not available for %s: %s\n", lhandle->channels, lhandle->id, snd_strerror(err));
return err; return err;
} }
rrate = lhandle->rate_req; rrate = lhandle->rate_req;
err = snd_pcm_hw_params_set_rate_near(handle, params, &rrate, 0); err = snd_pcm_hw_params_set_rate_near(handle, params, &rrate, 0);
if (err < 0) { if (err < 0) {
logit(LOG_CRIT, "Rate %iHz not available for %s: %s\n", lhandle->rate_req, lhandle->id, snd_strerror(err)); logit(LOG_CRIT, "Rate %uHz not available for %s: %s\n", lhandle->rate_req, lhandle->id, snd_strerror(err));
return err; return err;
} }
rrate = 0; rrate = 0;
@ -152,7 +152,7 @@ static int setparams_stream(struct loopback_handle *lhandle,
!lhandle->loopback->src_enable && !lhandle->loopback->src_enable &&
#endif #endif
(int)rrate != lhandle->rate) { (int)rrate != lhandle->rate) {
logit(LOG_CRIT, "Rate does not match (requested %iHz, got %iHz, resample %i)\n", lhandle->rate, rrate, lhandle->resample); logit(LOG_CRIT, "Rate does not match (requested %uHz, got %uHz, resample %u)\n", lhandle->rate, rrate, lhandle->resample);
return -EINVAL; return -EINVAL;
} }
lhandle->pitch = (double)lhandle->rate_req / (double)lhandle->rate; lhandle->pitch = (double)lhandle->rate_req / (double)lhandle->rate;
@ -1613,7 +1613,7 @@ __again:
if (count > loop->play->buffer_size) if (count > loop->play->buffer_size)
count = loop->play->buffer_size; count = loop->play->buffer_size;
if (err != count) { if (err != count) {
logit(LOG_CRIT, "%s: initial playback fill error (%i/%i/%i)\n", loop->id, err, (int)count, loop->play->buffer_size); logit(LOG_CRIT, "%s: initial playback fill error (%i/%i/%u)\n", loop->id, err, (int)count, loop->play->buffer_size);
err = -EIO; err = -EIO;
goto __error; goto __error;
} }

6
amixer/amixer.c
View file

@ -465,7 +465,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
size = tlv[idx++]; size = tlv[idx++];
tlv_size -= 2 * sizeof(unsigned int); tlv_size -= 2 * sizeof(unsigned int);
if (size > tlv_size) { if (size > tlv_size) {
printf("TLV size error (%i, %i, %i)!\n", type, size, tlv_size); printf("TLV size error (%u, %u, %u)!\n", type, size, tlv_size);
return; return;
} }
switch (type) { switch (type) {
@ -576,7 +576,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
break; break;
#endif #endif
default: default:
printf("unk-%i-", type); printf("unk-%u-", type);
while (size > 0) { while (size > 0) {
printf("0x%08x,", tlv[idx++]); printf("0x%08x,", tlv[idx++]);
size -= sizeof(unsigned int); size -= sizeof(unsigned int);
@ -611,7 +611,7 @@ static int show_control(const char *space, snd_hctl_elem_t *elem,
} }
count = snd_ctl_elem_info_get_count(info); count = snd_ctl_elem_info_get_count(info);
type = snd_ctl_elem_info_get_type(info); type = snd_ctl_elem_info_get_type(info);
printf("%s; type=%s,access=%s,values=%i", space, control_type(info), control_access(info), count); printf("%s; type=%s,access=%s,values=%u", space, control_type(info), control_access(info), count);
switch (type) { switch (type) {
case SND_CTL_ELEM_TYPE_INTEGER: case SND_CTL_ELEM_TYPE_INTEGER:
printf(",min=%li,max=%li,step=%li\n", printf(",min=%li,max=%li,step=%li\n",

2
aplay/aplay.c
View file

@ -3346,7 +3346,7 @@ static void playbackv(char **names, unsigned int count)
} }
alloced = 1; alloced = 1;
} else if (count != channels) { } else if (count != channels) {
error(_("You need to specify %d files"), channels); error(_("You need to specify %u files"), channels);
prg_exit(EXIT_FAILURE); prg_exit(EXIT_FAILURE);
} }

2
axfer/subcmd-list.c
View file

@ -31,7 +31,7 @@ static int dump_device(snd_ctl_t *handle, const char *id, const char *name,
snd_pcm_info_get_name(info)); snd_pcm_info_get_name(info));
count = snd_pcm_info_get_subdevices_count(info); count = snd_pcm_info_get_subdevices_count(info);
printf(" Subdevices: %i/%i\n", printf(" Subdevices: %i/%u\n",
snd_pcm_info_get_subdevices_avail(info), count); snd_pcm_info_get_subdevices_avail(info), count);
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {

2
axfer/xfer-libffado.c
View file

@ -440,7 +440,7 @@ static int xfer_libffado_pre_process(struct xfer_context *xfer,
} }
if (*samples_per_frame != channels) { if (*samples_per_frame != channels) {
fprintf(stderr, fprintf(stderr,
"The number of samples per frame should be %i.\n", "The number of samples per frame should be %u.\n",
channels); channels);
return -EINVAL; return -EINVAL;
} }

2
axfer/xfer-options.c
View file

@ -238,7 +238,7 @@ static int validate_options(struct xfer_context *xfer)
xfer->frames_per_second *= 1000; xfer->frames_per_second *= 1000;
if (xfer->frames_per_second < 2000 || if (xfer->frames_per_second < 2000 ||
xfer->frames_per_second > 192000) { xfer->frames_per_second > 192000) {
fprintf(stderr, "bad speed value '%i'\n", val); fprintf(stderr, "bad speed value '%u'\n", val);
return -EINVAL; return -EINVAL;
} }