Changeset 7917 for trunk/Ohana/src/opihi/cmd.data/rd.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/cmd.data/rd.c (modified) (11 diffs)

trunk/Ohana/src/opihi/cmd.data/rd.c

@@ -42 +42 @@
 
   if (extend && ccdsel) {
-    fprintf (stderr, "only specify one of -n and -x\n");
+    gprint (GP_ERR, "only specify one of -n and -x\n");
     return (FALSE);
   }
 
   if (argc != 3) {
-    fprintf (stderr, "USAGE: rd <buffer> <filename> [-head] [-plane N] [-n ccdid] [-x extnum]\n");
+    gprint (GP_ERR, "USAGE: rd <buffer> <filename> [-head] [-plane N] [-n ccdid] [-x extnum]\n");
     return (FALSE);
   }
@@ -54 +54 @@
   f = fopen (argv[2], "r");
   if (f == (FILE *) NULL) {
-    fprintf (stderr, "file %s not found\n", argv[2]);
+    gprint (GP_ERR, "file %s not found\n", argv[2]);
     return (FALSE);
   }
@@ -75 +75 @@
     Nskip = gfits_read_Xheader (argv[2], &buf[0].header, Nextend);
     if (!Nskip) {
-      fprintf (stderr, "entry in %s not found\n", argv[2]);
+      gprint (GP_ERR, "entry in %s not found\n", argv[2]);
       DeleteBuffer (buf);
       return (FALSE);
@@ -108 +108 @@
     f = fopen (argv[2], "r");
     if (f == (FILE *) NULL) {
-      fprintf (stderr, "file %s not found\n", argv[2]);
+      gprint (GP_ERR, "file %s not found\n", argv[2]);
       DeleteBuffer (buf);
       return (FALSE);
@@ -122 +122 @@
     CCDKeyword = get_variable ("CCDKEYWORD");
     if (CCDKeyword == (char *) NULL) {
-      fprintf (stderr, "CCDKEYWORD variable is not set; ");
-      fprintf (stderr, "using EXTNAME as default\n");
+      gprint (GP_ERR, "CCDKEYWORD variable is not set; ");
+      gprint (GP_ERR, "using EXTNAME as default\n");
       CCDKeyword = strcreate ("EXTNAME");
     }
@@ -130 +130 @@
       Nskip = gfits_read_Xheader (argv[2], &buf[0].header, i);
       if (!Nskip) {
-        fprintf (stderr, "extension %s in %s not found\n", ccdid, argv[2]);
+        gprint (GP_ERR, "extension %s in %s not found\n", ccdid, argv[2]);
         DeleteBuffer (buf);
         free (CCDKeyword);
@@ -136 +136 @@
       }
       if (!gfits_scan (&buf[0].header, CCDKeyword, "%s", 1, ID)) {
-        fprintf (stderr, "%s not in header\n", CCDKeyword);
+        gprint (GP_ERR, "%s not in header\n", CCDKeyword);
         DeleteBuffer (buf);
         free (CCDKeyword);
@@ -177 +177 @@
     f = fopen (argv[2], "r");
     if (f == (FILE *) NULL) {
-      fprintf (stderr, "file %s not found\n", argv[2]);
+      gprint (GP_ERR, "file %s not found\n", argv[2]);
       DeleteBuffer (buf);
       return (FALSE);
@@ -203 +203 @@
     if (Nplane > 0) {
       if (plane > Nplane) {
-        fprintf (stderr, "-plane is too large: %d total planes\n", Nplane);
+        gprint (GP_ERR, "-plane is too large: %d total planes\n", Nplane);
         DeleteBuffer (buf);
         return (FALSE);
@@ -217 +217 @@
 
   if (!status) {
-    fprintf (stderr, "problem reading file, buffer not opened\n");
+    gprint (GP_ERR, "problem reading file, buffer not opened\n");
     DeleteBuffer (buf);
     return (FALSE);
@@ -232 +232 @@
   buf[0].bzero  = buf[0].header.bzero;     /* store the original values */
   buf[0].unsign = buf[0].header.unsign;
-  fprintf (GetOutfile(), "read %d bytes from %s into buffer %s\n", 
+  gprint (GP_LOG, "read %d bytes from %s into buffer %s\n", 
            buf[0].header.size + buf[0].matrix.size, argv[2], argv[1]);