[Commit-gnuradio] r4036 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-11-27 17:03:58 -0700 (Mon, 27 Nov 2006)
New Revision: 4036

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
Log:
Work in progress, cleanup.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
    2006-11-27 23:55:25 UTC (rev 4035)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
    2006-11-28 00:03:58 UTC (rev 4036)
@@ -162,25 +162,17 @@
 
     for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
        if (is_input) {
-           if ((*p)->src_name() == name && (*p)->src_port() == port) {
-               match_name = (*p)->dst_name();
-               match_port = (*p)->dst_port();
-               break;
-           }
+           if ((*p)->src_name() == name && (*p)->src_port() == port)
+               return resolve_endpoint((*p)->dst_name(), (*p)->dst_port(), "", 
!is_input);
        }
        else {
-           if ((*p)->dst_name() == name && (*p)->dst_port() == port) {
-               match_name = (*p)->src_name();
-               match_port = (*p)->src_port();
-               break;
-           }
+           if ((*p)->dst_name() == name && (*p)->dst_port() == port)
+               return resolve_endpoint((*p)->src_name(), (*p)->src_port(), "", 
!is_input);
        }
     }
 
-    if (match_name == "")
-       throw std::runtime_error("unable to match endpoint");
-
-    return resolve_endpoint(match_name, match_port, "", !is_input);
+    // Should never get here
+    throw std::runtime_error("unable to match endpoint");
 }
 
 gr_endpoint