From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K4xTk-0006Pe-VN
	for qemu-devel@nongnu.org; Sat, 07 Jun 2008 08:25:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K4xTi-0006N5-PH
	for qemu-devel@nongnu.org; Sat, 07 Jun 2008 08:25:04 -0400
Received: from [199.232.76.173] (port=55655 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K4xTi-0006Mm-ET
	for qemu-devel@nongnu.org; Sat, 07 Jun 2008 08:25:02 -0400
Received: from ecfrec.frec.bull.fr ([129.183.4.8]:58800)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <Laurent.Vivier@bull.net>) id 1K4xTi-0005ZV-8f
	for qemu-devel@nongnu.org; Sat, 07 Jun 2008 08:25:02 -0400
Received: from localhost (localhost [127.0.0.1])
	by ecfrec.frec.bull.fr (Postfix) with ESMTP id 6D49D19D933
	for <qemu-devel@nongnu.org>; Sat,  7 Jun 2008 14:24:56 +0200 (CEST)
Received: from ecfrec.frec.bull.fr ([127.0.0.1])
	by localhost (ecfrec.frec.bull.fr [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 24279-08 for <qemu-devel@nongnu.org>;
	Sat,  7 Jun 2008 14:24:53 +0200 (CEST)
Received: from cyclope.frec.bull.fr (cyclope.frec.bull.fr [129.183.4.9])
	by ecfrec.frec.bull.fr (Postfix) with ESMTP id 0F51219D92F
	for <qemu-devel@nongnu.org>; Sat,  7 Jun 2008 14:24:53 +0200 (CEST)
Received: from [129.184.32.122] (client32-122.vpn_client.bull.fr
	[129.184.32.122])
	by cyclope.frec.bull.fr (Postfix) with ESMTP id E958A27289
	for <qemu-devel@nongnu.org>; Sat,  7 Jun 2008 14:24:49 +0200 (CEST)
From: Laurent Vivier <Laurent.Vivier@bull.net>
Content-Type: multipart/mixed; boundary="=-NnB2O9qKOZWl0nd3b8Y7"
Date: Sat, 07 Jun 2008 14:24:20 +0200
Message-Id: <1212841460.7985.6.camel@frecb07144>
Mime-Version: 1.0
Subject: [Qemu-devel] [PATCH] NBD cleanup
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" <qemu-devel@nongnu.org>


--=-NnB2O9qKOZWl0nd3b8Y7
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

This patch removes include of malloc.h from qemu-nbd.c to make it
compile on OS X. (as reported by C.W. Betts and commented by Daniel P.
Berrange)
It adjusts a printf format in nbd.c.
-- 
------------- Laurent.Vivier@bull.net ---------------
"The best way to predict the future is to invent it."
- Alan Kay

--=-NnB2O9qKOZWl0nd3b8Y7
Content-Disposition: attachment; filename=nbd-cleanup.patch
Content-Type: text/x-patch; name=nbd-cleanup.patch; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Index: nbd.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- nbd.c	(r=C3=A9vision 4690)
+++ nbd.c	(copie de travail)
@@ -388,7 +388,7 @@
 	}
=20
 	if (len > sizeof(data)) {
-		LOG("len (%u) is larger than max len (%u)",
+		LOG("len (%u) is larger than max len (%lu)",
 		    len, sizeof(data));
 		errno =3D EINVAL;
 		return -1;
Index: qemu-nbd.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- qemu-nbd.c	(r=C3=A9vision 4690)
+++ qemu-nbd.c	(copie de travail)
@@ -21,7 +21,6 @@
 #include "block_int.h"
 #include "nbd.h"
=20
-#include <malloc.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <getopt.h>

--=-NnB2O9qKOZWl0nd3b8Y7--