mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-02-21 01:40:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix SNDERR() format strings/arguments

Browse source
This commit is contained in:
Clemens Ladisch 2007-02-12 13:45:57 +01:00
parent 0c49463b8c
commit f54f03bfc4
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/confmisc.c
View file

@ -671,7 +671,7 @@ int snd_determine_driver(int card, char **driver)
assert(card >= 0 && card <= 32); assert(card >= 0 && card <= 32);
err = open_ctl(card, &ctl); err = open_ctl(card, &ctl);
if (err < 0) { if (err < 0) {
SNDERR("could not open control for card %li", card); SNDERR("could not open control for card %i", card);
goto __error; goto __error;
} }
snd_ctl_card_info_alloca(&info); snd_ctl_card_info_alloca(&info);
@ -1103,7 +1103,7 @@ int snd_func_pcm_args_by_class(snd_config_t **dst, snd_config_t *root, snd_confi
break; break;
err = open_ctl(card, &ctl); err = open_ctl(card, &ctl);
if (err < 0) { if (err < 0) {
SNDERR("could not open control for card %li", card); SNDERR("could not open control for card %i", card);
goto __out; goto __out;
} }
dev = -1; dev = -1;
@ -1111,7 +1111,7 @@ int snd_func_pcm_args_by_class(snd_config_t **dst, snd_config_t *root, snd_confi
while(1) { while(1) {
err = snd_ctl_pcm_next_device(ctl, &dev); err = snd_ctl_pcm_next_device(ctl, &dev);
if (err < 0) { if (err < 0) {
SNDERR("could not get next pcm for card %li", card); SNDERR("could not get next pcm for card %i", card);
goto __out; goto __out;
} }
if (dev < 0) if (dev < 0)

2
src/mixer/simple_none.c
View file

@ -1702,7 +1702,7 @@ static int simple_add1(snd_mixer_class_t *class, const char *name,
snd_mixer_selem_id_free(id); snd_mixer_selem_id_free(id);
} }
if (simple->ctls[type].elem) { if (simple->ctls[type].elem) {
SNDERR("helem (%s,'%s',%li,%li,%li) appears twice or more", SNDERR("helem (%s,'%s',%u,%u,%u) appears twice or more",
snd_ctl_elem_iface_name(snd_hctl_elem_get_interface(helem)), snd_ctl_elem_iface_name(snd_hctl_elem_get_interface(helem)),
snd_hctl_elem_get_name(helem), snd_hctl_elem_get_name(helem),
snd_hctl_elem_get_index(helem), snd_hctl_elem_get_index(helem),

4
src/pcm/pcm.c
View file

@ -7155,7 +7155,7 @@ int snd_pcm_set_params(snd_pcm_t *pcm,
/* set the count of channels */ /* set the count of channels */
err = snd_pcm_hw_params_set_channels(pcm, params, channels); err = snd_pcm_hw_params_set_channels(pcm, params, channels);
if (err < 0) { if (err < 0) {
SNDERR("Channels count (%i) not available for %s: %s", s, channels, snd_strerror(err)); SNDERR("Channels count (%i) not available for %s: %s", channels, s, snd_strerror(err));
return err; return err;
} }
/* set the stream rate */ /* set the stream rate */
@ -7212,7 +7212,7 @@ int snd_pcm_set_params(snd_pcm_t *pcm,
period_time = latency / 4; period_time = latency / 4;
err = INTERNAL(snd_pcm_hw_params_set_period_time_near)(pcm, params, &period_time, NULL); err = INTERNAL(snd_pcm_hw_params_set_period_time_near)(pcm, params, &period_time, NULL);
if (err < 0) { if (err < 0) {
SNDERR("Unable to set period time %i for %s: %s", s, period_time, snd_strerror(err)); SNDERR("Unable to set period time %i for %s: %s", period_time, s, snd_strerror(err));
return err; return err;
} }
err = INTERNAL(snd_pcm_hw_params_get_period_size)(params, &period_size, NULL); err = INTERNAL(snd_pcm_hw_params_get_period_size)(params, &period_size, NULL);

4
src/pcm/pcm_direct.c
View file

@ -1101,7 +1101,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix)
} }
if (snd_timer_poll_descriptors_count(dmix->timer) != 1) { if (snd_timer_poll_descriptors_count(dmix->timer) != 1) {
SNDERR("unable to use timer with fd more than one!!!", name); SNDERR("unable to use timer '%s' with more than one fd!", name);
return ret; return ret;
} }
snd_timer_poll_descriptors(dmix->timer, &dmix->timer_fd, 1); snd_timer_poll_descriptors(dmix->timer, &dmix->timer_fd, 1);
@ -1375,7 +1375,7 @@ int snd_pcm_direct_parse_bindings(snd_pcm_direct_t *dmix,
return -EINVAL; return -EINVAL;
} }
if (schannel < 0 || schannel >= params->channels) { if (schannel < 0 || schannel >= params->channels) {
SNDERR("invalid slave channel number %d in binding to %d", SNDERR("invalid slave channel number %ld in binding to %ld",
schannel, cchannel); schannel, cchannel);
free(bindings); free(bindings);
return -EINVAL; return -EINVAL;