Changeset 668

Timestamp:

May 13, 2004, 10:25:00 AM (22 years ago)

Author:

harman

Message:

Updated argument list for vector allocation

Location:

trunk/psLib/src

Files:

• collections/psSort.c (modified) (3 diffs)
• collections/psVector.c (modified) (3 diffs)
• mathtypes/psVector.c (modified) (3 diffs)

trunk/psLib/src/collections/psSort.c

@@ -14 +14 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-12 18:07:22 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-13 20:25:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -174 +174 @@
     float diff = 0.0f;
     psVector *tmpFloatVector = NULL;
-    psType tempType;
 
     if(outVector == NULL) {
@@ -198 +197 @@
     }
 
-    tempType.type = PS_TYPE_FLOAT;
-    tmpFloatVector = psVectorAlloc(tempType, inN);
+    tmpFloatVector = psVectorAlloc(PS_TYPE_FLOAT, inN);
     tmpFloatVector->n = inN;
     tmpFloatVector = psSort(tmpFloatVector, inVector);

trunk/psLib/src/collections/psVector.c

@@ -19 +19 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-12 18:07:22 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-13 20:25:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -91 +91 @@
 /* FUNCTION IMPLEMENTATION - PUBLIC                                          */
 /*****************************************************************************/
-psVector* psVectorAlloc(psType type, int nalloc)
-{
+psVector* psVectorAlloc(psElemType elemType, int nalloc)
+{
+    psVector *psVec = NULL;
     psElemType vecType = 0;
-    psDimen vecDim = 0;
-    psVector *psVec = NULL;
-
-    vecType = type.type;
-    vecDim =  type.dimen;
+
+    vecType = elemType;
 
     // Invalid nalloc
@@ -159 +157 @@
     vecType = psVec->type.type;
 
+    // Invalid nalloc
+    if(nalloc < 0) {
+        psError(__func__, " : Line %d - Invalid value for nalloc. nalloc: %d\n", __LINE__, nalloc);
+        return NULL;
+    }
+
     if(psVec == NULL) {                                 // For creating new psVector
-        psVec = psVectorAlloc(psVec->type, nalloc);
+        psVec = psVectorAlloc(psVec->type.type, nalloc);
     } else if(psVec->nalloc != nalloc) {                // No need to realloc to same size
         switch (vecType) {

trunk/psLib/src/mathtypes/psVector.c

@@ -19 +19 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-12 18:07:22 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-13 20:25:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -91 +91 @@
 /* FUNCTION IMPLEMENTATION - PUBLIC                                          */
 /*****************************************************************************/
-psVector* psVectorAlloc(psType type, int nalloc)
-{
+psVector* psVectorAlloc(psElemType elemType, int nalloc)
+{
+    psVector *psVec = NULL;
     psElemType vecType = 0;
-    psDimen vecDim = 0;
-    psVector *psVec = NULL;
-
-    vecType = type.type;
-    vecDim =  type.dimen;
+
+    vecType = elemType;
 
     // Invalid nalloc
@@ -159 +157 @@
     vecType = psVec->type.type;
 
+    // Invalid nalloc
+    if(nalloc < 0) {
+        psError(__func__, " : Line %d - Invalid value for nalloc. nalloc: %d\n", __LINE__, nalloc);
+        return NULL;
+    }
+
     if(psVec == NULL) {                                 // For creating new psVector
-        psVec = psVectorAlloc(psVec->type, nalloc);
+        psVec = psVectorAlloc(psVec->type.type, nalloc);
     } else if(psVec->nalloc != nalloc) {                // No need to realloc to same size
         switch (vecType) {