[Qemu-devel] [6528] audio: remove error handling from qemu_malloc() callers (Avi Kivity)

[Anthony Liguori]

Revision: 6528
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6528
Author:   aliguori
Date:     2009-02-05 22:05:58 +0000 (Thu, 05 Feb 2009)

Log Message:
-----------
audio: remove error handling from qemu_malloc() callers (Avi Kivity)

Signed-off-by: Avi Kivity <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/audio/audio.c
    trunk/audio/wavcapture.c

Modified: trunk/audio/audio.c
===================================================================
--- trunk/audio/audio.c 2009-02-05 22:05:53 UTC (rev 6527)
+++ trunk/audio/audio.c 2009-02-05 22:05:58 UTC (rev 6528)
@@ -197,8 +197,8 @@
 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 @@
     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 @@
          * 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);
 

Modified: trunk/audio/wavcapture.c
===================================================================
--- trunk/audio/wavcapture.c    2009-02-05 22:05:53 UTC (rev 6527)
+++ trunk/audio/wavcapture.c    2009-02-05 22:05:58 UTC (rev 6528)
@@ -120,11 +120,6 @@
     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;