Changeset 7917 for trunk/Ohana/src/opihi/lib.shell/BufferOps.c

Timestamp:

Jul 16, 2006, 10:58:49 PM (20 years ago)

Author:

eugene

Message:

major updates to use gprint for buffered / threaded printing

File:

• trunk/Ohana/src/opihi/lib.shell/BufferOps.c (modified) (5 diffs)

trunk/Ohana/src/opihi/lib.shell/BufferOps.c

@@ -65 +65 @@
 
  error:
-  if (verbose) fprintf (stderr, "invalid matrix %s\n", name);
+  if (verbose) gprint (GP_ERR, "invalid matrix %s\n", name);
   return (NULL);
 }
@@ -202 +202 @@
 
   if (*number < 0) {
-    fprintf (stderr, "valid overlays may be: red (0), green (1), blue (2), yellow (3)\n");
+    gprint (GP_ERR, "valid overlays may be: red (0), green (1), blue (2), yellow (3)\n");
     return (FALSE);
   }
@@ -214 +214 @@
   int i;
 
-  fprintf (stderr, "try %d\n", n);
+  gprint (GP_ERR, "try %d\n", n);
   for (i = 0; i < Nbuffers; i++) {
-    fprintf (stderr, "%d  %lx\n", i, (long) buffers[i]);
-    fprintf (stderr, "%d  %lx  %s\n", i, (long) buffers[i][0].name, buffers[i][0].name);
-    fprintf (stderr, "%d  %lx  %s\n", i, (long) buffers[i][0].file, buffers[i][0].file);
-    fprintf (stderr, "%d  %lx  %lx\n", i, (long) &buffers[i][0].header, (long) buffers[i][0].header.buffer);
-    fprintf (stderr, "%d  %lx  %lx\n", i, (long) &buffers[i][0].matrix, (long) buffers[i][0].matrix.buffer);
-    fprintf (stderr, "%d  %d  %d  %f %f\n", i, buffers[i][0].bitpix, buffers[i][0].unsign, buffers[i][0].bscale, buffers[i][0].bzero);
+    gprint (GP_ERR, "%d  %lx\n", i, (long) buffers[i]);
+    gprint (GP_ERR, "%d  %lx  %s\n", i, (long) buffers[i][0].name, buffers[i][0].name);
+    gprint (GP_ERR, "%d  %lx  %s\n", i, (long) buffers[i][0].file, buffers[i][0].file);
+    gprint (GP_ERR, "%d  %lx  %lx\n", i, (long) &buffers[i][0].header, (long) buffers[i][0].header.buffer);
+    gprint (GP_ERR, "%d  %lx  %lx\n", i, (long) &buffers[i][0].matrix, (long) buffers[i][0].matrix.buffer);
+    gprint (GP_ERR, "%d  %d  %d  %f %f\n", i, buffers[i][0].bitpix, buffers[i][0].unsign, buffers[i][0].bscale, buffers[i][0].bzero);
   }
 }
@@ -230 +230 @@
 
   if (Nbuffers == 0) {
-    fprintf (stderr, "No allocated buffers\n");
+    gprint (GP_ERR, "No allocated buffers\n");
     return (TRUE);
   }
   
   if (Long) {
-    fprintf (GetOutfile(), "    N       name                      file     X     Y    bytes BP  U   bzero     bscale  \n");
+    gprint (GP_LOG, "    N       name                      file     X     Y    bytes BP  U   bzero     bscale  \n");
     for (i = 0; i < Nbuffers; i++) {
-      fprintf (GetOutfile(), "%5d %10s %25s %5d %5d %10d %3d %1d %10.4e %10.4e\n",
+      gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d %3d %1d %10.4e %10.4e\n",
                i, buffers[i][0].name, buffers[i][0].file, 
                buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1],
@@ -246 +246 @@
   }
 
-  fprintf (GetOutfile(), "    N       name                      file     X     Y    bytes\n");
+  gprint (GP_LOG, "    N       name                      file     X     Y    bytes\n");
   for (i = 0; i < Nbuffers; i++) {
-    fprintf (GetOutfile(), "%5d %10s %25s %5d %5d %10d\n",
+    gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d\n",
              i, buffers[i][0].name, buffers[i][0].file, 
              buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1],