From 75b3f9e88bee7a861878d369d3ca8f0d59177527 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Crist=C3=B3v=C3=A3o=20Cruz?= <cac@ua.pt>
Date: Thu, 18 Feb 2010 23:44:44 +0000
Subject: [PATCH] Return style changed.

---
 test_clusterfree.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/test_clusterfree.c b/test_clusterfree.c
index d84ba57..54972b8 100644
--- a/test_clusterfree.c
+++ b/test_clusterfree.c
@@ -57,14 +57,14 @@ testresult_t test_clusterfree (void)
     /* check fctable limits */
     if ((sb->fctable_head) >= (sb->fctable_size)*RPB) {
         printf("fctable_head is out of bounds.\n");
-        ret = corrupt;
+        return corrupt;
     }
     if ((sb->fctable_tail) >= (sb->fctable_size)*RPB) {
         printf("fctable_tail is out of bounds.\n");
-        ret = corrupt;
+        return corrupt;
     }
     pos = sb->fctable_head;
-    while ((pos != sb->fctable_tail) && (ret != corrupt)) {
+    while (pos != sb->fctable_tail) {
         fret = soReadRawBlock((sb->fctable_start)+(pos/RPB), fcrefs);
         if (fret < 0) FABORT(fret, "sbfreeclusters");
 
@@ -81,11 +81,11 @@ testresult_t test_clusterfree (void)
     /* check head cache */
     cacheidx = sb->dzone_head.cache_idx;
     cachecnt = sb->dzone_head.cache_cnt;
-    if ((cacheidx + cachecnt > DZONE_CACHE_SIZE) && (ret != corrupt)) {
+    if (cacheidx + cachecnt > DZONE_CACHE_SIZE) {
         printf("Head cache has incorrect information.\n");
-        ret = corrupt;
+        return corrupt;
     }
-    for (r = cacheidx; (r < cacheidx + cachecnt) && (ret != corrupt); ++r) {
+    for (r = cacheidx; r < cacheidx + cachecnt, ++r) {
         cba = (sb->dzone_head.cache)[r]; 
         if (check_cluster(cba) == true) {
             freeclusters++;
@@ -98,11 +98,11 @@ testresult_t test_clusterfree (void)
     /* check tail cache */
     cacheidx = 0;
     cachecnt = sb->dzone_tail.cache_cnt;
-    if ((cacheidx + cachecnt >= DZONE_CACHE_SIZE) && (ret != corrupt)) {
+    if (cacheidx + cachecnt >= DZONE_CACHE_SIZE) {
         printf("Tail cache has incorrect information.\n");
-        ret = corrupt;
+        return corrupt;
     }
-    for (r = cacheidx; (r < cacheidx + cachecnt) && (ret != corrupt); ++r) { 
+    for (r = cacheidx; r < cacheidx + cachecnt; ++r) { 
         cba = (sb->dzone_tail.cache)[r]; 
         if (check_cluster(cba) == true) {
             freeclusters++;
@@ -112,8 +112,9 @@ testresult_t test_clusterfree (void)
         }
     }
 
-    if ((ret != corrupt) && (freeclusters != sb->dzone_free)) {
-        printf("donze_free is not correct.\n");
+    if (freeclusters != sb->dzone_free) {
+        printf("donze_free is %u, should be %u.\n", sb->dzone_free,
+               freeclusters);
         ret = corrupt;
     }
 
-- 
2.11.4.GIT