qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Volker Rümelin" <vr_qemu@t-online.de>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: "Christian Schoenebeck" <qemu_oss@crudebyte.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	qemu-devel@nongnu.org
Subject: [PATCH v2 09/11] audio: remove audio_calloc() function
Date: Sat, 21 Jan 2023 10:47:33 +0100	[thread overview]
Message-ID: <20230121094735.11644-9-vr_qemu@t-online.de> (raw)
In-Reply-To: <0a4007dc-e11c-f16e-0e21-dbc4e60caa59@t-online.de>

Now that the last call site of audio_calloc() was removed, remove
the unused audio_calloc() function.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
 audio/audio.c     | 20 --------------------
 audio/audio_int.h |  1 -
 2 files changed, 21 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index ac5434a13c..fb0d4a2cac 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -147,26 +147,6 @@ static inline int audio_bits_to_index (int bits)
     }
 }
 
-void *audio_calloc (const char *funcname, int nmemb, size_t size)
-{
-    int cond;
-    size_t len;
-
-    len = nmemb * size;
-    cond = !nmemb || !size;
-    cond |= nmemb < 0;
-    cond |= len < size;
-
-    if (audio_bug ("audio_calloc", cond)) {
-        AUD_log (NULL, "%s passed invalid arguments to audio_calloc\n",
-                 funcname);
-        AUD_log (NULL, "nmemb=%d size=%zu (len=%zu)\n", nmemb, size, len);
-        return NULL;
-    }
-
-    return g_malloc0 (len);
-}
-
 void AUD_vlog (const char *cap, const char *fmt, va_list ap)
 {
     if (cap) {
diff --git a/audio/audio_int.h b/audio/audio_int.h
index ce2d6bf92c..5028f2354a 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -251,7 +251,6 @@ void audio_pcm_init_info (struct audio_pcm_info *info, 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);
-void *audio_calloc (const char *funcname, int nmemb, size_t size);
 
 void audio_run(AudioState *s, const char *msg);
 
-- 
2.35.3



  parent reply	other threads:[~2023-01-21  9:50 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-21  9:45 [PATCH v2 00/11] audio: more improvements Volker Rümelin
2023-01-21  9:47 ` [PATCH v2 01/11] audio: log unimplemented audio device sample rates Volker Rümelin
2023-01-21  9:47 ` [PATCH v2 02/11] audio: don't show unnecessary error messages Volker Rümelin
2023-01-21  9:47 ` [PATCH v2 03/11] audio: rename hardware store to backend Volker Rümelin
2023-01-23  7:33   ` Philippe Mathieu-Daudé
2023-01-21  9:47 ` [PATCH v2 04/11] audio: remove unused #define AUDIO_STRINGIFY Volker Rümelin
2023-01-21  9:47 ` [PATCH v2 05/11] audio/mixeng: use g_new0() instead of audio_calloc() Volker Rümelin
2023-01-21  9:47 ` [PATCH v2 06/11] audio/alsaaudio: " Volker Rümelin
2023-01-21  9:47 ` [PATCH v2 07/11] audio/audio_template: use g_malloc0() to replace audio_calloc() Volker Rümelin
2023-01-23 11:03   ` Daniel P. Berrangé
2023-01-21  9:47 ` [PATCH v2 08/11] audio/audio_template: use g_new0() " Volker Rümelin
2023-01-23 11:04   ` Daniel P. Berrangé
2023-01-21  9:47 ` Volker Rümelin [this message]
2023-01-21  9:47 ` [PATCH v2 10/11] alsaaudio: change default playback settings Volker Rümelin
2023-01-23  7:43   ` Philippe Mathieu-Daudé
2023-01-24  7:34     ` Volker Rümelin
2023-01-21  9:47 ` [PATCH v2 11/11] alsaaudio: reintroduce default recording settings Volker Rümelin
2023-01-23  7:44   ` Philippe Mathieu-Daudé
2023-01-31 14:51 ` [PATCH v2 00/11] audio: more improvements Marc-André Lureau
2023-03-05 17:35 ` Volker Rümelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230121094735.11644-9-vr_qemu@t-online.de \
    --to=vr_qemu@t-online.de \
    --cc=berrange@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu_oss@crudebyte.com \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).