[PATCH 17/37] audio: constify audsettings argument

marcandre.lureau@redhat.com posted 37 patches 2 days, 2 hours ago
Maintainers: Gerd Hoffmann <kraxel@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Thomas Huth <huth@tuxfamily.org>, Alexandre Ratchov <alex@caoua.org>, Laurent Vivier <laurent@vivier.eu>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Alistair Francis <alistair@alistair23.me>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>
[PATCH 17/37] audio: constify audsettings argument
Posted by marcandre.lureau@redhat.com 2 days, 2 hours ago
From: Marc-André Lureau <marcandre.lureau@redhat.com>

It shouldn't be modified by the audio functions.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 audio/audio_int.h      | 2 +-
 audio/audio_template.h | 6 +++---
 include/qemu/audio.h   | 4 ++--
 audio/audio.c          | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/audio/audio_int.h b/audio/audio_int.h
index 25de0e3f9cf..a6276375887 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -265,7 +265,7 @@ extern const char *audio_prio_list[];
 
 void audio_driver_register(audio_driver *drv);
 
-void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as);
+void audio_pcm_init_info (struct audio_pcm_info *info, const struct audsettings *as);
 void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len);
 
 int audio_bug (const char *funcname, int cond);
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 1ab3c47fd76..e69e6e74570 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -159,7 +159,7 @@ static int glue (audio_pcm_sw_init_, TYPE) (
     SW *sw,
     HW *hw,
     const char *name,
-    struct audsettings *as
+    const struct audsettings *as
     )
 {
     int err;
@@ -426,7 +426,7 @@ static HW *glue(audio_pcm_hw_add_, TYPE)(AudioBackend *s, struct audsettings *as
 static SW *glue(audio_pcm_create_voice_pair_, TYPE)(
     AudioBackend *s,
     const char *sw_name,
-    struct audsettings *as
+    const struct audsettings *as
     )
 {
     SW *sw;
@@ -491,7 +491,7 @@ SW *glue (AUD_open_, TYPE) (
     const char *name,
     void *callback_opaque ,
     audio_callback_fn callback_fn,
-    struct audsettings *as
+    const struct audsettings *as
     )
 {
     AudioBackend *s = be;
diff --git a/include/qemu/audio.h b/include/qemu/audio.h
index a1a64ad340d..370e993f080 100644
--- a/include/qemu/audio.h
+++ b/include/qemu/audio.h
@@ -58,7 +58,7 @@ SWVoiceOut *AUD_open_out (
     const char *name,
     void *callback_opaque,
     audio_callback_fn callback_fn,
-    struct audsettings *settings
+    const struct audsettings *settings
     );
 
 void AUD_close_out (AudioBackend *be, SWVoiceOut *sw);
@@ -97,7 +97,7 @@ SWVoiceIn *AUD_open_in(
     const char *name,
     void *callback_opaque,
     audio_callback_fn callback_fn,
-    struct audsettings *settings
+    const struct audsettings *settings
     );
 
 void AUD_close_in(AudioBackend *be, SWVoiceIn *sw);
diff --git a/audio/audio.c b/audio/audio.c
index 5b9d352f325..6eb921f0cca 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -169,7 +169,7 @@ void AUD_log (const char *cap, const char *fmt, ...)
     va_end (ap);
 }
 
-static void audio_print_settings (struct audsettings *as)
+static void audio_print_settings (const struct audsettings *as)
 {
     dolog ("frequency=%d nchannels=%d fmt=", as->freq, as->nchannels);
 
@@ -215,7 +215,7 @@ static void audio_print_settings (struct audsettings *as)
     AUD_log (NULL, "\n");
 }
 
-static int audio_validate_settings (struct audsettings *as)
+static int audio_validate_settings (const struct audsettings *as)
 {
     int invalid;
 
@@ -240,7 +240,7 @@ static int audio_validate_settings (struct audsettings *as)
     return invalid ? -1 : 0;
 }
 
-static int audio_pcm_info_eq (struct audio_pcm_info *info, struct audsettings *as)
+static int audio_pcm_info_eq (struct audio_pcm_info *info, const struct audsettings *as)
 {
     int bits = 8;
     bool is_signed = false, is_float = false;
@@ -280,7 +280,7 @@ static int audio_pcm_info_eq (struct audio_pcm_info *info, struct audsettings *a
         && info->swap_endianness == (as->endianness != HOST_BIG_ENDIAN);
 }
 
-void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as)
+void audio_pcm_init_info (struct audio_pcm_info *info, const struct audsettings *as)
 {
     int bits = 8, mul;
     bool is_signed = false, is_float = false;
-- 
2.52.0