# HG changeset patch
# User mas01cr
# Date 1230116076 0
# Node ID 447f1cf2c2761d9f04ad40c62b22fb48ed1af9d8
# Parent  9de6d0676907e4a8b299ea748ac31b9700f7ffab
Begin quelling the noise of reporter.h

In preparation for working out which bits of it are relevant to
matched point accumulation, and which are the accumulation, in another
sense, of a couple of years of backwards-compatibility efforts.

diff -r 9de6d0676907 -r 447f1cf2c276 reporter.h
--- a/reporter.h	Fri Dec 12 15:37:17 2008 +0000
+++ b/reporter.h	Wed Dec 24 10:54:36 2008 +0000
@@ -105,25 +105,26 @@
       std::cout << r.dist << " " << r.qpos << " " << r.spos << std::endl;
     }
   } else {
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeRlist=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeDist=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeQpos=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeSpos=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.Rlist= new char*[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Dist = new double[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Qpos = new unsigned int[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Spos = new unsigned int[size];
+    adb__queryResponse *response = (adb__queryResponse *) adbQueryResponse;
+    response->result.__sizeRlist=size;
+    response->result.__sizeDist=size;
+    response->result.__sizeQpos=size;
+    response->result.__sizeSpos=size;
+    response->result.Rlist= new char*[size];
+    response->result.Dist = new double[size];
+    response->result.Qpos = new unsigned int[size];
+    response->result.Spos = new unsigned int[size];
     unsigned int k = 0;
     for(rit = v.rbegin(); rit < v.rend(); rit++, k++) {
       r = *rit;
-      ((adb__queryResponse*)adbQueryResponse)->result.Rlist[k] = new char[O2_MAXFILESTR];
-      ((adb__queryResponse*)adbQueryResponse)->result.Dist[k] = r.dist;
-      ((adb__queryResponse*)adbQueryResponse)->result.Qpos[k] = r.qpos;
-      ((adb__queryResponse*)adbQueryResponse)->result.Spos[k] = r.spos;
+      response->result.Rlist[k] = new char[O2_MAXFILESTR];
+      response->result.Dist[k] = r.dist;
+      response->result.Qpos[k] = r.qpos;
+      response->result.Spos[k] = r.spos;
       if(fileTable)
-	snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
+	snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
       else
-	snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);
+	snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);
     }
   }
 }
@@ -212,25 +213,26 @@
       std::cout << r.dist << " " << r.qpos << " " << r.spos << std::endl;
     }
   } else {
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeRlist=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeDist=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeQpos=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeSpos=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.Rlist= new char*[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Dist = new double[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Qpos = new unsigned int[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Spos = new unsigned int[size];
+    adb__queryResponse *response = (adb__queryResponse *) adbQueryResponse;
+    response->result.__sizeRlist=size;
+    response->result.__sizeDist=size;
+    response->result.__sizeQpos=size;
+    response->result.__sizeSpos=size;
+    response->result.Rlist= new char*[size];
+    response->result.Dist = new double[size];
+    response->result.Qpos = new unsigned int[size];
+    response->result.Spos = new unsigned int[size];
     unsigned int k = 0;
     for(rit = v.rbegin(); rit < v.rend(); rit++, k++) {
       r = *rit;
-      ((adb__queryResponse*)adbQueryResponse)->result.Rlist[k] = new char[O2_MAXFILESTR];
-      ((adb__queryResponse*)adbQueryResponse)->result.Dist[k] = r.dist;
-      ((adb__queryResponse*)adbQueryResponse)->result.Qpos[k] = r.qpos;
-      ((adb__queryResponse*)adbQueryResponse)->result.Spos[k] = r.spos;
+      response->result.Rlist[k] = new char[O2_MAXFILESTR];
+      response->result.Dist[k] = r.dist;
+      response->result.Qpos[k] = r.qpos;
+      response->result.Spos[k] = r.spos;
       if(fileTable)
-	snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
+	snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
       else
-	snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);
+	snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);
     }
   }
 }
@@ -316,14 +318,15 @@
       }
     }
   } else {
-   ((adb__queryResponse*)adbQueryResponse)->result.__sizeRlist=size*pointNN;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeDist=size*pointNN;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeQpos=size*pointNN;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeSpos=size*pointNN;
-    ((adb__queryResponse*)adbQueryResponse)->result.Rlist= new char*[size*pointNN];
-    ((adb__queryResponse*)adbQueryResponse)->result.Dist = new double[size*pointNN];
-    ((adb__queryResponse*)adbQueryResponse)->result.Qpos = new unsigned int[size*pointNN];
-    ((adb__queryResponse*)adbQueryResponse)->result.Spos = new unsigned int[size*pointNN];
+    adb__queryResponse *response = (adb__queryResponse *) adbQueryResponse;
+    response->result.__sizeRlist=size*pointNN;
+    response->result.__sizeDist=size*pointNN;
+    response->result.__sizeQpos=size*pointNN;
+    response->result.__sizeSpos=size*pointNN;
+    response->result.Rlist= new char*[size*pointNN];
+    response->result.Dist = new double[size*pointNN];
+    response->result.Qpos = new unsigned int[size*pointNN];
+    response->result.Spos = new unsigned int[size*pointNN];
     unsigned int k = 0;
     // Loop over returned tracks
     for(rit = v.rbegin(); rit < v.rend(); rit++) {
@@ -345,20 +348,20 @@
 	  rk.spos = 0xFFFFFFFF;
 	}
 	  
-	((adb__queryResponse*)adbQueryResponse)->result.Rlist[k] = new char[O2_MAXFILESTR];
-	((adb__queryResponse*)adbQueryResponse)->result.Dist[k] = rk.dist;
-	((adb__queryResponse*)adbQueryResponse)->result.Qpos[k] = rk.qpos;
-	((adb__queryResponse*)adbQueryResponse)->result.Spos[k] = rk.spos;
+	response->result.Rlist[k] = new char[O2_MAXFILESTR];
+	response->result.Dist[k] = rk.dist;
+	response->result.Qpos[k] = rk.qpos;
+	response->result.Spos[k] = rk.spos;
 	if(qsize){
 	  if(fileTable)
-	    snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
+	    snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
 	  else
-	    snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);	
+	    snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);	
 	  point_queue.pop();
 	  qsize--;
 	}
 	else
-	  snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "NULL");		  
+	  snprintf(response->result.Rlist[k], O2_MAXFILESTR, "NULL");		  
 	k++;
       }
     }
@@ -495,27 +498,27 @@
 	std::cout << r.trackID << " ";
       std::cout << r.count << std::endl;
     }
-  } 
- else {
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeRlist=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeDist=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeQpos=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeSpos=size;
-    ((adb__queryResponse*)adbQueryResponse)->result.Rlist= new char*[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Dist = new double[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Qpos = new unsigned int[size];
-    ((adb__queryResponse*)adbQueryResponse)->result.Spos = new unsigned int[size];
+  } else {
+    adb__queryResponse *response = (adb__queryResponse *) adbQueryResponse;
+    response->result.__sizeRlist=size;
+    response->result.__sizeDist=size;
+    response->result.__sizeQpos=size;
+    response->result.__sizeSpos=size;
+    response->result.Rlist= new char*[size];
+    response->result.Dist = new double[size];
+    response->result.Qpos = new unsigned int[size];
+    response->result.Spos = new unsigned int[size];
     unsigned int k = 0;
     for(rit = v.rbegin(); rit < v.rend(); rit++, k++) {
       r = *rit;
-      ((adb__queryResponse*)adbQueryResponse)->result.Rlist[k] = new char[O2_MAXFILESTR];
-      ((adb__queryResponse*)adbQueryResponse)->result.Dist[k] = 0;
-      ((adb__queryResponse*)adbQueryResponse)->result.Qpos[k] = 0;
-      ((adb__queryResponse*)adbQueryResponse)->result.Spos[k] = r.count;
+      response->result.Rlist[k] = new char[O2_MAXFILESTR];
+      response->result.Dist[k] = 0;
+      response->result.Qpos[k] = 0;
+      response->result.Spos[k] = r.count;
       if(fileTable)
-	snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
+	snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
       else
-	snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);
+	snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);
     }
   }
 }
@@ -666,16 +669,16 @@
 	point_queue.pop();
       }
     }
-  }
- else {
-   ((adb__queryResponse*)adbQueryResponse)->result.__sizeRlist=size*pointNN;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeDist=size*pointNN;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeQpos=size*pointNN;
-    ((adb__queryResponse*)adbQueryResponse)->result.__sizeSpos=size*pointNN;
-    ((adb__queryResponse*)adbQueryResponse)->result.Rlist= new char*[size*pointNN];
-    ((adb__queryResponse*)adbQueryResponse)->result.Dist = new double[size*pointNN];
-    ((adb__queryResponse*)adbQueryResponse)->result.Qpos = new unsigned int[size*pointNN];
-    ((adb__queryResponse*)adbQueryResponse)->result.Spos = new unsigned int[size*pointNN];
+  } else {
+    adb__queryResponse *response = (adb__queryResponse *) adbQueryResponse;
+    response->result.__sizeRlist=size*pointNN;
+    response->result.__sizeDist=size*pointNN;
+    response->result.__sizeQpos=size*pointNN;
+    response->result.__sizeSpos=size*pointNN;
+    response->result.Rlist= new char*[size*pointNN];
+    response->result.Dist = new double[size*pointNN];
+    response->result.Qpos = new unsigned int[size*pointNN];
+    response->result.Spos = new unsigned int[size*pointNN];
     unsigned int k = 0;
     // Loop over returned tracks
     for(rit = v.rbegin(); rit < v.rend(); rit++) {
@@ -697,20 +700,20 @@
 	  rk.spos = 0xFFFFFFFF;
 	}
 	  
-	((adb__queryResponse*)adbQueryResponse)->result.Rlist[k] = new char[O2_MAXFILESTR];
-	((adb__queryResponse*)adbQueryResponse)->result.Dist[k] = rk.dist;
-	((adb__queryResponse*)adbQueryResponse)->result.Qpos[k] = rk.qpos;
-	((adb__queryResponse*)adbQueryResponse)->result.Spos[k] = rk.spos;
+	response->result.Rlist[k] = new char[O2_MAXFILESTR];
+	response->result.Dist[k] = rk.dist;
+	response->result.Qpos[k] = rk.qpos;
+	response->result.Spos[k] = rk.spos;
 	if(qsize){
 	  if(fileTable)
-	    snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
+	    snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%s", fileTable+r.trackID*O2_FILETABLE_ENTRY_SIZE);
 	  else
-	    snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);	
+	    snprintf(response->result.Rlist[k], O2_MAXFILESTR, "%d", r.trackID);	
 	  point_queue.pop();
 	  qsize--;
 	}
 	else
-	  snprintf(((adb__queryResponse*)adbQueryResponse)->result.Rlist[k], O2_MAXFILESTR, "NULL");
+	  snprintf(response->result.Rlist[k], O2_MAXFILESTR, "NULL");
 	k++;
       }
     }