Changeset 2273 for trunk/psLib/src/astro/psCoord.c

Timestamp:

Nov 3, 2004, 3:05:00 PM (22 years ago)

Author:

desonia

Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

File:

• trunk/psLib/src/astro/psCoord.c (modified) (8 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-27 23:31:43 $
+*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-04 01:04:57 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 #include "psConstants.h"
 #include "psError.h"
+#include "psAstronomyErrors.h"
 #include <math.h>
 #include <float.h>
@@ -278 +279 @@
 
     } else if (projection->type == PS_PROJ_PAR) {
-        psError(__func__, "The projection type PS_PROJ_PAR is undefined.\n");
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psCoord_PROJECTION_TYPE_UNDEFINED,
+                "PS_PROJ_PAR");
 
     } else if (projection->type == PS_PROJ_GLS) {
-        psError(__func__, "The projection type PS_PROJ_GLS is undefined.\n");
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psCoord_PROJECTION_TYPE_UNDEFINED,
+                "PS_PROJ_GLS");
     } else {
-        psError(__func__, "Unknown projection type.\n");
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psCoord_PROJECTION_TYPE_UNKNOWN,
+                projection->type);
     }
 
@@ -333 +340 @@
 
     } else if (projection->type == PS_PROJ_PAR) {
-        psError(__func__, "The projection type PS_PROJ_PAR is undefined.\n");
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psCoord_PROJECTION_TYPE_UNDEFINED,
+                "PS_PROJ_PAR");
 
     } else if (projection->type == PS_PROJ_GLS) {
-        psError(__func__, "The projection type PS_PROJ_GLG is undefined.\n");
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psCoord_PROJECTION_TYPE_UNDEFINED,
+                "PS_PROJ_GLS");
     } else {
-        psError(__func__, "Unknown projection type.\n");
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psCoord_PROJECTION_TYPE_UNKNOWN,
+                projection->type);
     }
 
@@ -407 +420 @@
         } else if (unit == PS_RADIAN) {}
         else {
-            psError(__func__, "Unknown offset unit: 0x%x\n", unit);
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    PS_ERRORTEXT_psCoord_UNITS_UNKNOWN,
+                    unit);
         }
 
@@ -413 +428 @@
     }
 
-    psError(__func__, "Unrecognized offset mode\n");
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+            PS_ERRORTEXT_psCoord_OFFSET_MODE_UNKNOWN,
+            mode);
     return (NULL);
 }
@@ -469 +486 @@
             tmpD = offset->d;
         } else {
-            psError(__func__, "Unknown offset unit: 0x%x\n", unit);
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    PS_ERRORTEXT_psCoord_UNITS_UNKNOWN,
+                    unit);
         }
 
@@ -483 +502 @@
     }
 
-    psError(__func__, "Unrecognized offset mode\n");
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+            PS_ERRORTEXT_psCoord_OFFSET_MODE_UNKNOWN,
+            mode);
+
     return (NULL);
 }