Changeset 2006

Timestamp:

Oct 7, 2004, 9:51:30 AM (22 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib

Files:

• src/collections/psCollectionsErrors.dat (modified) (1 diff)
• src/collections/psCollectionsErrors.h (modified) (2 diffs)
• src/collections/psVector.c (modified) (3 diffs)
• src/mathtypes/psVector.c (modified) (3 diffs)
• test/astronomy/tst_psAstrometry.c (modified) (1 diff)

trunk/psLib/src/collections/psCollectionsErrors.dat

@@ -9 +9 @@
 #
 psVector_REALLOC_NULL                  psVectorRealloc must a given a non-NULL psVector to resize.  Desired datatype unknown.
+psVector_NOT_A_VECTOR                  The input psVector must have a vector dimension type.
 psVector_SORT_NULL                     psVectorSort can not sort a NULL psVector.
 psVector_UNSUPPORTED_TYPE              Input psVector is an unsupported type (%d).

trunk/psLib/src/collections/psCollectionsErrors.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-21 23:15:04 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-07 19:51:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -31 +31 @@
 //~Start #define PS_ERRORTEXT_$1 "$2"
 #define PS_ERRORTEXT_psVector_REALLOC_NULL "psVectorRealloc must a given a non-NULL psVector to resize.  Desired datatype unknown."
+#define PS_ERRORTEXT_psVector_NOT_A_VECTOR "The input psVector must have a vector dimension type."
 #define PS_ERRORTEXT_psVector_SORT_NULL "psVectorSort can not sort a NULL psVector."
 #define PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE "Input psVector is an unsupported type (%d)."

trunk/psLib/src/collections/psVector.c

@@ -10 +10 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-28 23:26:48 $
+*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:51:30 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -96 +96 @@
     }
 
+    if (in->type.dimen !=  PS_DIMEN_VECTOR &&
+            in->type.dimen !=  PS_DIMEN_TRANSV) {
+        psFree(in);
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psVectorRecycle",
+                   PS_ERR_BAD_PARAMETER_TYPE, true,
+                   PS_ERRORTEXT_psVector_NOT_A_VECTOR);
+        return NULL;
+    }
+
     byteSize = n * PSELEMTYPE_SIZEOF(type);
 
@@ -104 +113 @@
     }
 
+    in->type.dimen = PS_DIMEN_VECTOR;
     in->type.type = type;
     in->n = n;
-
     return in;
 }

trunk/psLib/src/mathtypes/psVector.c

@@ -10 +10 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-28 23:26:48 $
+*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:51:30 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -96 +96 @@
     }
 
+    if (in->type.dimen !=  PS_DIMEN_VECTOR &&
+            in->type.dimen !=  PS_DIMEN_TRANSV) {
+        psFree(in);
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psVectorRecycle",
+                   PS_ERR_BAD_PARAMETER_TYPE, true,
+                   PS_ERRORTEXT_psVector_NOT_A_VECTOR);
+        return NULL;
+    }
+
     byteSize = n * PSELEMTYPE_SIZEOF(type);
 
@@ -104 +113 @@
     }
 
+    in->type.dimen = PS_DIMEN_VECTOR;
     in->type.type = type;
     in->n = n;
-
     return in;
 }

trunk/psLib/test/astronomy/tst_psAstrometry.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-07 19:17:23 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-07 19:51:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii