From owner-svn-soc-all@FreeBSD.ORG  Tue Jul  3 03:18:43 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id D9B6C106564A
	for <svn-soc-all@FreeBSD.org>; Tue,  3 Jul 2012 03:18:40 +0000 (UTC)
	(envelope-from vchan@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 03 Jul 2012 03:18:40 +0000
Date: Tue, 03 Jul 2012 03:18:40 +0000
From: vchan@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120703031840.D9B6C106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238883 - soc2012/vchan/gtcp/bwalex-tc-play
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2012 03:18:43 -0000

Author: vchan
Date: Tue Jul  3 03:18:39 2012
New Revision: 238883
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238883

Log:
  check tcplay_new.c for changes

Modified:
  soc2012/vchan/gtcp/bwalex-tc-play/Makefile
  soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c

Modified: soc2012/vchan/gtcp/bwalex-tc-play/Makefile
==============================================================================
--- soc2012/vchan/gtcp/bwalex-tc-play/Makefile	Tue Jul  3 02:55:27 2012	(r238882)
+++ soc2012/vchan/gtcp/bwalex-tc-play/Makefile	Tue Jul  3 03:18:39 2012	(r238883)
@@ -21,7 +21,7 @@
 OBJS=	tcplay.o crc32.o safe_mem.o io.o hdr.o humanize.o
 OBJS+=	crypto.o generic_xts.o
 
-CFLAGS+= $(WARNFLAGS)
+CFLAGS+= $(WARNFLAGS) -I/usr/include
 
 ifeq (${DEBUG}, yes)
   CFLAGS+= -O0 -g -DDEBUG

Modified: soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c
==============================================================================
--- soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c	Tue Jul  3 02:55:27 2012	(r238882)
+++ soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c	Tue Jul  3 03:18:39 2012	(r238883)
@@ -979,9 +979,9 @@
 	char *uu;
 	char *uu_stack[64];
 	int uu_stack_idx;
-#if defined(__DragonFly__)
-	uint32_t status;
-#endif
+//#if defined(__DragonFly__)
+//	uint32_t status;
+//#endif
 	int r, ret = 0;
 	int j;
 	off_t start, offset;
@@ -1041,15 +1041,15 @@
 			goto out;
 		}
 
-#if defined(__linux__)
-		uuid_generate(info->uuid);
-		if ((uu = malloc(1024)) == NULL) {
-			tc_log(1, "uuid_unparse memory failed\n");
-			ret = -1;
-			goto out;
-		}
-		uuid_unparse(info->uuid, uu);
-#elif defined(__DragonFly__)
+//#if defined(__linux__)
+//		uuid_generate(info->uuid);
+//		if ((uu = malloc(1024)) == NULL) {
+//			tc_log(1, "uuid_unparse memory failed\n");
+//			ret = -1;
+//			goto out;
+//		}
+//		uuid_unparse(info->uuid, uu);
+//#elif defined(__DragonFly__)
 		uuid_create(&info->uuid, &status);
 		if (status != uuid_s_ok) {
 			tc_log(1, "uuid_create failed\n");
@@ -1063,7 +1063,7 @@
 			ret = -1;
 			goto out;
 		}
-#endif
+//#endif
 
 		if ((dm_task_set_uuid(dmt, uu)) == 0) {
 			free(uu);