Index: trunk/psLib/src/image/psImageIO.c
===================================================================
--- trunk/psLib/src/image/psImageIO.c	(revision 2210)
+++ trunk/psLib/src/image/psImageIO.c	(revision 2273)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 19:35:58 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -47,7 +47,6 @@
 
     if (filename == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImageIO_FILENAME_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImageIO_FILENAME_NULL);
         psFree(output);
         return NULL;
@@ -58,8 +57,7 @@
     if (fptr == NULL || status != 0) {
         fits_get_errstatus(status, fitsErr);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psImageIO_FILENAME_INVALID,
-                   filename, fitsErr);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImageIO_FILENAME_INVALID,
+                filename, fitsErr);
         psFree(output);
         return NULL;
@@ -72,8 +70,7 @@
             status = 0;
             (void)fits_close_file(fptr, &status);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                       PS_ERR_LOCATION_INVALID, true,
-                       PS_ERRORTEXT_psImageIO_EXTNAME_INVALID,
-                       extname, filename, fitsErr);
+            psError(PS_ERR_LOCATION_INVALID, true,
+                    PS_ERRORTEXT_psImageIO_EXTNAME_INVALID,
+                    extname, filename, fitsErr);
             psFree(output);
             return NULL;
@@ -84,8 +81,7 @@
             status = 0;
             (void)fits_close_file(fptr, &status);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                       PS_ERR_LOCATION_INVALID, true,
-                       PS_ERRORTEXT_psImageIO_EXTNUM_INVALID,
-                       extnum, filename, fitsErr);
+            psError(PS_ERR_LOCATION_INVALID, true,
+                    PS_ERRORTEXT_psImageIO_EXTNUM_INVALID,
+                    extnum, filename, fitsErr);
             psFree(output);
             return NULL;
@@ -98,8 +94,7 @@
         status = 0;
         (void)fits_close_file(fptr, &status);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                   PS_ERR_IO, true,
-                   PS_ERRORTEXT_psImageIO_DATATYPE_UNKNOWN,
-                   filename, fitsErr);
+        psError(PS_ERR_IO, true,
+                PS_ERRORTEXT_psImageIO_DATATYPE_UNKNOWN,
+                filename, fitsErr);
         psFree(output);
         return NULL;
@@ -111,8 +106,7 @@
         status = 0;
         (void)fits_close_file(fptr, &status);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                   PS_ERR_IO, true,
-                   PS_ERRORTEXT_psImageIO_IMAGE_DIM_UNKNOWN,
-                   filename, fitsErr);
+        psError(PS_ERR_IO, true,
+                PS_ERRORTEXT_psImageIO_IMAGE_DIM_UNKNOWN,
+                filename, fitsErr);
         psFree(output);
         return NULL;
@@ -123,8 +117,7 @@
         status = 0;
         (void)fits_close_file(fptr, &status);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                   PS_ERR_IO, true,
-                   PS_ERRORTEXT_psImageIO_IMAGE_DIMENSION_UNSUPPORTED,
-                   nAxis);
+        psError(PS_ERR_IO, true,
+                PS_ERRORTEXT_psImageIO_IMAGE_DIMENSION_UNSUPPORTED,
+                nAxis);
         psFree(output);
         return NULL;
@@ -136,8 +129,7 @@
         status = 0;
         (void)fits_close_file(fptr, &status);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                   PS_ERR_IO, true,
-                   PS_ERRORTEXT_psImageIO_IMAGE_SIZE_UNKNOWN,
-                   filename, fitsErr);
+        psError(PS_ERR_IO, true,
+                PS_ERRORTEXT_psImageIO_IMAGE_SIZE_UNKNOWN,
+                filename, fitsErr);
         psFree(output);
         return NULL;
@@ -201,8 +193,7 @@
         break;
     default:
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                   PS_ERR_IO, true,
-                   PS_ERRORTEXT_psImageIO_FITS_TYPE_UNSUPPORTED,
-                   bitPix, filename);
+        psError(PS_ERR_IO, true,
+                PS_ERRORTEXT_psImageIO_FITS_TYPE_UNSUPPORTED,
+                bitPix, filename);
         psFree(output);
         return NULL;
@@ -215,8 +206,7 @@
         status = 0;
         (void)fits_close_file(fptr, &status);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection",
-                   PS_ERR_IO, true,
-                   PS_ERRORTEXT_psImageIO_READ_FAILED,
-                   filename, fitsErr);
+        psError(PS_ERR_IO, true,
+                PS_ERRORTEXT_psImageIO_READ_FAILED,
+                filename, fitsErr);
         return NULL;
     }
@@ -253,7 +243,6 @@
     /* need a valid image to write */
     if (input == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
         return false;
     }
@@ -301,8 +290,7 @@
             char* typeStr;
             PS_TYPE_NAME(typeStr,input->type.type);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                       PS_ERR_BAD_PARAMETER_TYPE, true,
-                       PS_ERRORTEXT_psImageIO_TYPE_UNSUPPORTED,
-                       typeStr);
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                    PS_ERRORTEXT_psImageIO_TYPE_UNSUPPORTED,
+                    typeStr);
             return false;
         }
@@ -315,8 +303,7 @@
         if (fptr == NULL || status != 0) {
             fits_get_errstatus(status, fitsErr);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                       PS_ERR_BAD_PARAMETER_VALUE, true,
-                       PS_ERRORTEXT_psImageIO_FILENAME_INVALID,
-                       filename, fitsErr);
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    PS_ERRORTEXT_psImageIO_FILENAME_INVALID,
+                    filename, fitsErr);
             return false;
         }
@@ -328,8 +315,7 @@
                 status = 0;
                 (void)fits_close_file(fptr, &status);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                           PS_ERR_LOCATION_INVALID, true,
-                           PS_ERRORTEXT_psImageIO_EXTNAME_INVALID,
-                           extname, filename, fitsErr);
+                psError(PS_ERR_LOCATION_INVALID, true,
+                        PS_ERRORTEXT_psImageIO_EXTNAME_INVALID,
+                        extname, filename, fitsErr);
                 return false;
             }
@@ -341,8 +327,7 @@
                 status = 0;
                 (void)fits_close_file(fptr, &status);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                           PS_ERR_LOCATION_INVALID, true,
-                           PS_ERRORTEXT_psImageIO_WRITE_EXTNUM_INVALID,
-                           extnum, numHDUs);
+                psError(PS_ERR_LOCATION_INVALID, true,
+                        PS_ERRORTEXT_psImageIO_WRITE_EXTNUM_INVALID,
+                        extnum, numHDUs);
                 return false;
             } else if (numHDUs == extnum) {
@@ -352,8 +337,7 @@
                 status = 0;
                 (void)fits_close_file(fptr, &status);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                           PS_ERR_LOCATION_INVALID, true,
-                           PS_ERRORTEXT_psImageIO_EXTNUM_INVALID,
-                           extnum, filename, fitsErr);
+                psError(PS_ERR_LOCATION_INVALID, true,
+                        PS_ERRORTEXT_psImageIO_EXTNUM_INVALID,
+                        extnum, filename, fitsErr);
                 return false;
             }
@@ -368,8 +352,7 @@
         if (fptr == NULL || status != 0) {
             fits_get_errstatus(status, fitsErr);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                       PS_ERR_IO, true,
-                       PS_ERRORTEXT_psImageIO_FILENAME_CREATE_FAILED,
-                       filename, fitsErr);
+            psError(PS_ERR_IO, true,
+                    PS_ERRORTEXT_psImageIO_FILENAME_CREATE_FAILED,
+                    filename, fitsErr);
             return false;
         }
@@ -386,8 +369,7 @@
             status = 0;
             (void)fits_close_file(fptr, &status);
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                       PS_ERR_IO, true,
-                       PS_ERRORTEXT_psImageIO_CREATE_HDU_FAILED,
-                       filename, fitsErr);
+            psError(PS_ERR_IO, true,
+                    PS_ERRORTEXT_psImageIO_CREATE_HDU_FAILED,
+                    filename, fitsErr);
             return false;
         }
@@ -403,8 +385,7 @@
                 status = 0;
                 (void)fits_close_file(fptr, &status);
-                psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                           PS_ERR_IO, true,
-                           PS_ERRORTEXT_psImageIO_CREATE_EXTENSION_FAILED,
-                           filename, fitsErr);
+                psError(PS_ERR_IO, true,
+                        PS_ERRORTEXT_psImageIO_CREATE_EXTENSION_FAILED,
+                        filename, fitsErr);
                 return false;
             }
@@ -424,8 +405,7 @@
         status = 0;
         (void)fits_close_file(fptr, &status);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection",
-                   PS_ERR_IO, true,
-                   PS_ERRORTEXT_psImageIO_WRITE_FAILED,
-                   filename, fitsErr);
+        psError(PS_ERR_IO, true,
+                PS_ERRORTEXT_psImageIO_WRITE_FAILED,
+                filename, fitsErr);
         return false;
     }