From: Lee Schermerhorn <lee.schermerhorn@hp.com>
Date: Wed, 02 Apr 2008 14:34:55 -0400

PATCH 5/10 numactl - Minor cleanups of numademo.c

Against:  numactl-1.0.3-rc1

1) Add a 'break' stmt to 'case MEMSET'.  Must be needed, else the
   MEMCPY case overwrites memset start/end values.

2) Eliminate unused label/variable warnings in memtest()

Reviewed-by: Christoph Lameter <clameter@sgi.com>

 numademo.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


Index: Numactl.d/numademo.c
===================================================================
--- Numactl.d.orig/numademo.c	2008-02-26 11:07:39.000000000 -0500
+++ Numactl.d/numademo.c	2008-02-26 11:10:12.000000000 -0500
@@ -104,7 +104,10 @@ static inline unsigned long long timerfo
 
 void memtest(char *name, unsigned char *mem)
 { 
-	long k, w;
+	long k;
+#ifdef HAVE_MT
+	long w;
+#endif
 	struct timeval start, end, res;
 	unsigned long long max, min, sum, r; 
 	int i;
@@ -126,6 +129,8 @@ void memtest(char *name, unsigned char *
 			gettimeofday(&start,NULL);
 			memset(mem, 0xff, msize); 
 			gettimeofday(&end,NULL);
+			break;
+
 		case MEMCPY: 
 			gettimeofday(&start,NULL);
 			memcpy(mem, mem + msize/2, msize/2); 
@@ -188,7 +193,10 @@ void memtest(char *name, unsigned char *
 #undef H
 #undef D3
 	output(title,result);
+
+#ifdef HAVE_STREAM_LIB
  out:
+#endif
 	numa_free(mem, msize); 
 } 

