Date: Tue, 03 Jul 2012 03:18:40 +0000 From: vchan@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r238883 - soc2012/vchan/gtcp/bwalex-tc-play Message-ID: <20120703031840.D9B6C106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120703031840.D9B6C106564A>