diff options
| -rw-r--r-- | audio/audio.c | 23 | ||||
| -rw-r--r-- | audio/wavcapture.c | 5 |
2 files changed, 8 insertions, 20 deletions
diff --git a/audio/audio.c b/audio/audio.c index e2635c001f..b0a5f3b4b5 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -197,8 +197,8 @@ void *audio_calloc (const char *funcname, int nmemb, size_t size) static char *audio_alloc_prefix (const char *s) { const char qemu_prefix[] = "QEMU_"; - size_t len; - char *r; + size_t len, i; + char *r, *u; if (!s) { return NULL; @@ -207,17 +207,15 @@ static char *audio_alloc_prefix (const char *s) len = strlen (s); r = qemu_malloc (len + sizeof (qemu_prefix)); - if (r) { - size_t i; - char *u = r + sizeof (qemu_prefix) - 1; + u = r + sizeof (qemu_prefix) - 1; - pstrcpy (r, len + sizeof (qemu_prefix), qemu_prefix); - pstrcat (r, len + sizeof (qemu_prefix), s); + pstrcpy (r, len + sizeof (qemu_prefix), qemu_prefix); + pstrcat (r, len + sizeof (qemu_prefix), s); - for (i = 0; i < len; ++i) { - u[i] = qemu_toupper(u[i]); - } + for (i = 0; i < len; ++i) { + u[i] = qemu_toupper(u[i]); } + return r; } @@ -460,11 +458,6 @@ static void audio_process_options (const char *prefix, * sizeof) */ optlen = len + preflen + sizeof (qemu_prefix) + 1; optname = qemu_malloc (optlen); - if (!optname) { - dolog ("Could not allocate memory for option name `%s'\n", - opt->name); - continue; - } pstrcpy (optname, optlen, qemu_prefix); diff --git a/audio/wavcapture.c b/audio/wavcapture.c index 9919171e40..6d1c4413b5 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -120,11 +120,6 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, ops.destroy = wav_destroy; wav = qemu_mallocz (sizeof (*wav)); - if (!wav) { - term_printf ("Could not allocate memory for wav capture (%zu bytes)", - sizeof (*wav)); - return -1; - } shift = bits16 + stereo; hdr[34] = bits16 ? 0x10 : 0x08; |