[brlcad-commits] SF.net SVN: brlcad:[50077] brlcad/trunk/src/mged/chgview.c

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

Revision: 50077
          http://brlcad.svn.sourceforge.net/brlcad/?rev=50077&view=rev
Author:   brlcad
Date:     2012-04-16 14:47:52 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
quell a deadcode defect detected by coverity (cid 217) by cleaning up the logic to match the messages being printed.  if it introduces a bug, then the message being printed is wrong/misleading.

Modified Paths:
--------------
    brlcad/trunk/src/mged/chgview.c

Modified: brlcad/trunk/src/mged/chgview.c
===================================================================
--- brlcad/trunk/src/mged/chgview.c	2012-04-16 14:36:42 UTC (rev 50076)
+++ brlcad/trunk/src/mged/chgview.c	2012-04-16 14:47:52 UTC (rev 50077)
@@ -1008,14 +1008,18 @@
     }
 
     /* preserve same old behavior */
-    if (nmatch > 1 && ri == 0) {
-	Tcl_AppendResult(interp, nargv[1], " multiply referenced\n", (char *)NULL);
-	goto bail_out;
-    } else if (ri != 0 && ri != nmatch) {
-	Tcl_AppendResult(interp,
-			 "the reference index must be less than the number of references\n",
-			 (char *)NULL);
-	goto bail_out;
+    if (ri == 0) {
+	if (nmatch > 1) {
+	    Tcl_AppendResult(interp, nargv[1], " multiply referenced\n", (char *)NULL);
+	    goto bail_out;
+	}
+    } else {
+	if (ri >= nmatch) {
+	    Tcl_AppendResult(interp,
+			     "the reference index must be less than the number of references\n",
+			     (char *)NULL);
+	    goto bail_out;
+	}
     }
 
     /* Make the specified solid the illuminated solid */

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