Index: /branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/read_vectors.c
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/read_vectors.c	(revision 32845)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/read_vectors.c	(revision 32846)
@@ -314,9 +314,4 @@
   for (i = 1; i < argc; i++) {
     void   *data;
-    char   *Pc;
-    short  *Ps;
-    int    *Pi;
-    float  *Pf;
-    double *Pd;
     int Nval;
     char name[80];
@@ -348,41 +343,49 @@
     }
 
+    if (!strcmp (type, "char")) {
+      char *Ptr = data;
+      for (j = 0; j < Ny; j++) {
+	for (k = 0; k < Nval; k++, Ptr++) {
+	  vec[k][0].elements.Int[j] = *Ptr;
+	}
+      }
+    }
+    if (!strcmp (type, "short")) {
+      short *Ptr = data;
+      for (j = 0; j < Ny; j++) {
+	for (k = 0; k < Nval; k++, Ptr++) {
+	  vec[k][0].elements.Int[j] = *Ptr;
+	}
+      }
+    }
+    if (!strcmp (type, "int")) {
+      int *Ptr = data;
+      for (j = 0; j < Ny; j++) {
+	for (k = 0; k < Nval; k++, Ptr++) {
+	  vec[k][0].elements.Int[j] = *Ptr;
+	}
+      }
+    }
+    if (!strcmp (type, "int64_t")) {
+      int64_t *Ptr = data;
+      for (j = 0; j < Ny; j++) {
+	for (k = 0; k < Nval; k++, Ptr++) {
+	  vec[k][0].elements.Int[j] = *Ptr;
+	}
+      }
+    }
+    if (!strcmp (type, "float")) {
+      float *Ptr = data;
+      for (j = 0; j < Ny; j++) {
+	for (k = 0; k < Nval; k++, Ptr++) {
+	  vec[k][0].elements.Flt[j] = *Ptr;
+	}
+      }
+    }
     if (!strcmp (type, "double")) {
-      Pd = (double *) data;
+      double *Ptr = data;
       for (j = 0; j < Ny; j++) {
-	for (k = 0; k < Nval; k++, Pd++) {
-	  vec[k][0].elements.Flt[j] = *Pd;
-	}
-      }
-    }
-    if (!strcmp (type, "float")) {
-      Pf = (float *) data;
-      for (j = 0; j < Ny; j++) {
-	for (k = 0; k < Nval; k++, Pf++) {
-	  vec[k][0].elements.Flt[j] = *Pf;
-	}
-      }
-    }
-    if (!strcmp (type, "int")) {
-      Pi = (int *) data;
-      for (j = 0; j < Ny; j++) {
-	for (k = 0; k < Nval; k++, Pi++) {
-	  vec[k][0].elements.Int[j] = *Pi;
-	}
-      }
-    }
-    if (!strcmp (type, "short")) {
-      Ps = (short *) data;
-      for (j = 0; j < Ny; j++) {
-	for (k = 0; k < Nval; k++, Ps++) {
-	  vec[k][0].elements.Int[j] = *Ps;
-	}
-      }
-    }
-    if (!strcmp (type, "char")) {
-      Pc = (char *) data;
-      for (j = 0; j < Ny; j++) {
-	for (k = 0; k < Nval; k++, Pc++) {
-	  vec[k][0].elements.Int[j] = *Pc;
+	for (k = 0; k < Nval; k++, Ptr++) {
+	  vec[k][0].elements.Flt[j] = *Ptr;
 	}
       }