From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KjkMb-0004zo-UJ
	for qemu-devel@nongnu.org; Sat, 27 Sep 2008 20:42:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KjkMb-0004zX-Hs
	for qemu-devel@nongnu.org; Sat, 27 Sep 2008 20:42:17 -0400
Received: from [199.232.76.173] (port=49588 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KjkMb-0004zQ-7S
	for qemu-devel@nongnu.org; Sat, 27 Sep 2008 20:42:17 -0400
Received: from savannah.gnu.org ([199.232.41.3]:34265 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1KjkMb-0008GD-8n
	for qemu-devel@nongnu.org; Sat, 27 Sep 2008 20:42:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1KjkMa-0001vq-9O
	for qemu-devel@nongnu.org; Sun, 28 Sep 2008 00:42:16 +0000
Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <malc@savannah.gnu.org>) id 1KjkMa-0001vm-3U
	for qemu-devel@nongnu.org; Sun, 28 Sep 2008 00:42:16 +0000
MIME-Version: 1.0
Errors-To: malc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: malc <av1474@comtv.ru>
Message-Id: <E1KjkMa-0001vm-3U@cvs.savannah.gnu.org>
Date: Sun, 28 Sep 2008 00:42:16 +0000
Subject: [Qemu-devel] [5337] Fix more r5087 breakage
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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) {