[Qemu-devel] [5337] Fix more r5087 breakage

[Qemu-devel] [5337] Fix more r5087 breakage

[malc]

Revision: 5337
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5337
Author:   malc
Date:     2008-09-28 00:42:15 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
Fix more r5087 breakage

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

Modified: trunk/audio/audio.c
===================================================================
--- trunk/audio/audio.c	2008-09-28 00:42:12 UTC (rev 5336)
+++ trunk/audio/audio.c	2008-09-28 00:42:15 UTC (rev 5337)
@@ -212,7 +212,7 @@
         char *u = r + sizeof (qemu_prefix) - 1;
 
         pstrcpy (r, len + sizeof (qemu_prefix), qemu_prefix);
-        pstrcat (r, len, s);
+        pstrcat (r, len + sizeof (qemu_prefix), s);
 
         for (i = 0; i < len; ++i) {
             u[i] = toupper (u[i]);
@@ -467,16 +467,13 @@
         }
 
         pstrcpy (optname, optlen, qemu_prefix);
-        optlen -= preflen;
 
         /* copy while upper-casing, including trailing zero */
         for (i = 0; i <= preflen; ++i) {
             optname[i + sizeof (qemu_prefix) - 1] = toupper (prefix[i]);
         }
         pstrcat (optname, optlen, "_");
-        optlen--;
         pstrcat (optname, optlen, opt->name);
-        optlen -= len;
 
         def = 1;
         switch (opt->tag) {