From 41e42ef31bf7c7d3f290e662a3b4bbb5c9abb68d Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Mon, 23 Jul 2012 14:52:21 -0700
Subject: more minor polishing

---
 tools/hi-q.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'tools/hi-q.c')

diff --git a/tools/hi-q.c b/tools/hi-q.c
index d267d2c..502de69 100644
--- a/tools/hi-q.c
+++ b/tools/hi-q.c
@@ -527,13 +527,13 @@ bar
     }
 
 // figure out the intended bindings:
-    int pardang1(-1), pardang2(-1);     // used by current kid,
-                                        // but dangling, from parent's point of view
+    list<int> pardang;
     switch (filter[ii].mode) {
       case sa:
       case series:
-          pardang1 = current_write[MSG] = datapipe[wEnd];
-          pardang2 = current_read[MSG];
+          current_write[MSG] = datapipe[wEnd];
+          pardang.push_back(current_write[MSG]);
+          pardang.push_back(current_read[MSG]);
           next_read[MSG] = datapipe[rEnd];
         break;
       case qq:
@@ -541,7 +541,8 @@ bar
             cerr << "???? multiple qq jobs?" << endl;
           }
           slurp_write= datapipe[wEnd];
-          pardang1 = current_read[ENV] = datapipe[rEnd];
+          current_read[ENV] = datapipe[rEnd];
+          pardang.push_back(current_read[ENV]);
           next_read[ENV] = -1;
           next_read[MSG] = -1;
           current_write[ENV] = -1;
@@ -672,13 +673,13 @@ bar
     close(current_write[MSG]);
     close(current_write[ENV]);
     close(current_read[ENV]);
-    if (0) cerr << "closing " << pardang1
-            << "  for parent of " << kidid << endl;
+    for (LI::const_iterator ptr = pardang.begin();
+           ptr != pardang.end(); ptr++) {
+      if (0) cerr << "closing " << *ptr
+              << "  for parent of " << kidid << endl;
 
-    close(pardang1);
-    if (0) cerr << "closing " << pardang2
-            << "  for parent of " << kidid << endl;
-    close(pardang2);
+      close(*ptr);
+    }
 
 // Let kid #0 run a little ways:
     if (ii==0) {
-- 
cgit v1.2.3