]> git.alsa-project.org Git - alsa-utils.git/commitdiff
Use %lli for long long in printf
authorMichael Forney <mforney@mforney.org>
Wed, 5 Feb 2020 08:12:20 +0000 (00:12 -0800)
committerTakashi Iwai <tiwai@suse.de>
Mon, 10 Feb 2020 11:39:17 +0000 (12:39 +0100)
The `L` length modifier only applies to floating-point conversion
specifiers, and `ll` is used for `long long` integers.

Although glibc accepts %Li, musl does not and returns EINVAL.

Signed-off-by: Michael Forney <mforney@mforney.org>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
alsactl/state.c
amixer/amixer.c

index 38e85c06c0b0c04dc47abc73ea9359daebde9f50..22e0269fd30a95cca2b9f28ea3438f2ab0fd26ea 100644 (file)
@@ -336,9 +336,9 @@ static int get_control(snd_ctl_t *handle, snd_ctl_elem_id_t *id, snd_config_t *t
                long long max = snd_ctl_elem_info_get_max64(info);
                long long step = snd_ctl_elem_info_get_step64(info);
                if (step)
-                       sprintf(buf, "%Li - %Li (step %Li)", min, max, step);
+                       sprintf(buf, "%lli - %lli (step %lli)", min, max, step);
                else
-                       sprintf(buf, "%Li - %Li", min, max);
+                       sprintf(buf, "%lli - %lli", min, max);
                err = snd_config_string_add(comment, "range", buf);
                if (err < 0) {
                        error("snd_config_string_add: %s", snd_strerror(err));
index 928f7c5d6482d754940314fe50a856c2ca51d522..4c19a583e5b19659c750759271c62bd7df43d545 100644 (file)
@@ -620,7 +620,7 @@ static int show_control(const char *space, snd_hctl_elem_t *elem,
                       snd_ctl_elem_info_get_step(info));
                break;
        case SND_CTL_ELEM_TYPE_INTEGER64:
-               printf(",min=%Li,max=%Li,step=%Li\n", 
+               printf(",min=%lli,max=%lli,step=%lli\n",
                       snd_ctl_elem_info_get_min64(info),
                       snd_ctl_elem_info_get_max64(info),
                       snd_ctl_elem_info_get_step64(info));
@@ -662,7 +662,7 @@ static int show_control(const char *space, snd_hctl_elem_t *elem,
                                printf("%li", snd_ctl_elem_value_get_integer(control, idx));
                                break;
                        case SND_CTL_ELEM_TYPE_INTEGER64:
-                               printf("%Li", snd_ctl_elem_value_get_integer64(control, idx));
+                               printf("%lli", snd_ctl_elem_value_get_integer64(control, idx));
                                break;
                        case SND_CTL_ELEM_TYPE_ENUMERATED:
                                printf("%u", snd_ctl_elem_value_get_enumerated(control, idx));