-- Remove stop watch functions from assignment.c

-- Small fixes to numsort.c, stringsort.c, and bitfield.c


git-svn-id: svn://mattst88.com/svn/cleanbench/trunk@24 0d43b9a7-5ab2-4d7b-af9d-f64450cef757

1 files changed, 12 insertions, 33 deletions

diff --git a/bitfield.c b/bitfield.c
index 6d0cf0b..4b70206 100644
--- a/bitfield.c
+++ b/bitfield.c
@@ -200,27 +200,23 @@ DoBitfieldIteration(unsigned long *bitarraybase, unsigned long *bitoparraybase,
 ****************
 ** Complements a run of bits.
 */
-static void FlipBitRun(unsigned long *bitmap,        /* Bit map */
-		unsigned long bit_addr,                 /* Bit address */
-		unsigned long nbits)                    /* # of bits to flip */
+static void
+FlipBitRun(unsigned long *bitmap, unsigned long bit_addr, unsigned long nbits) 
 {
-unsigned long bindex;   /* Index into array */
-unsigned long bitnumb;  /* Bit number */
+        unsigned long bindex;   /* Index into array */
+        unsigned long bitnumb;  /* Bit number */
 
-while(nbits--)
-{
+        while (nbits--) {
 #ifdef _LP64
-	bindex=bit_addr>>6;     /* Index is number /64 */
-	bitnumb=bit_addr % 64;  /* Bit number in longword */
+                bindex=bit_addr>>6;     /* Index is number /64 */
+                bitnumb=bit_addr % 64;  /* Bit number in longword */
 #else
-	bindex=bit_addr>>5;     /* Index is number /32 */
-	bitnumb=bit_addr % 32;  /* Bit number in longword */
+                bindex=bit_addr>>5;     /* Index is number /32 */
+                bitnumb=bit_addr % 32;  /* Bit number in longword */
 #endif
-	bitmap[bindex]^=(1L<<bitnumb);
-	bit_addr++;
-}
-
-return;
+                bitmap[bindex]^=(1L<<bitnumb);
+                bit_addr++;
+        }
 }
 
 /*****************************
@@ -237,21 +233,6 @@ void ToggleBitRun(unsigned long *bitmap, /* Bitmap */
 	unsigned long bindex;   /* Index into array */
 	unsigned long bitnumb;  /* Bit number */
 
-#if 0
-	while (nbits != 0) {
-		nbits--;
-
-		bindex = bit_addr >> 6;     /* Index is number /64 */
-		bitnumb = bit_addr % 64;    /* Bit number in word */
-
-		if (val) {
-			bitmap[bindex] |= (1L << bitnumb);
-		} else {
-			bitmap[bindex] &= ~(1L << bitnumb);
-		}
-		bit_addr++;
-	}
-#else
 	if (val) {
 		for (; nbits != 0; nbits--) {
 			bindex = bit_addr >> 6;
@@ -271,6 +252,4 @@ void ToggleBitRun(unsigned long *bitmap, /* Bitmap */
 			bit_addr++;
 		}
 	}	
-#endif
-	return;
 }