[brlcad-commits] SF.net SVN: brlcad:[50132] brlcad/trunk/src/librt/search.c

[<br...@us...>]

Revision: 50132
          http://brlcad.svn.sourceforge.net/brlcad/?rev=50132&view=rev
Author:   brlcad
Date:     2012-04-17 16:39:07 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
vastly simplify the logic by just checking what we need piecewise.  reduces about 50 lines to 15.  hopefully addresses the deadcode condition being reported in cid 212 due to the now-singular path through the if/else cases.

Modified Paths:
--------------
    brlcad/trunk/src/librt/search.c

Modified: brlcad/trunk/src/librt/search.c
===================================================================
--- brlcad/trunk/src/librt/search.c	2012-04-17 16:20:08 UTC (rev 50131)
+++ brlcad/trunk/src/librt/search.c	2012-04-17 16:39:07 UTC (rev 50132)
@@ -1400,44 +1400,18 @@
 	return 0;
     }
 
-    if (doequal && dogreaterthan) {
-	if (node_count >= node_count_target) {
+    if (doequal) {
+	if (node_count == node_count_target) {
 	    return 1;
-	} else {
-	    return 0;
 	}
     }
-
-    if (doequal && dolessthan) {
-	if (node_count <= node_count_target) {
-	    return 1;
-	} else {
-	    return 0;
-	}
-    }
-
-    if (dogreaterthan) {
-	if (node_count > node_count_target) {
-	    return 1;
-	} else {
-	    return 0;
-	}
-    }
-
     if (dolessthan) {
 	if (node_count < node_count_target) {
 	    return 1;
-	} else {
-	    return 0;
 	}
-    }
-
-
-    if (doequal) {
-	if (node_count == node_count_target) {
+    } else if (dogreaterthan) {
+	if (node_count > node_count_target) {
 	    return 1;
-	} else {
-	    return 0;
 	}
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.