Changeset 4330 for trunk/psLib/src/collections/psVector.c

Timestamp:

Jun 20, 2005, 5:01:37 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

File:

• trunk/psLib/src/collections/psVector.c (modified) (6 diffs)

trunk/psLib/src/collections/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-10 21:46:46 $
+*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-21 03:01:37 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -129 +129 @@
 }
 
-psVector *psVectorExtend(psVector *vector, int delta, int nExtend)
+psVector *psVectorExtend(psVector *vector, long delta, long nExtend)
 {
     // can't handle a NULL vector (don't know the data type to allocate)
@@ -166 +166 @@
 }
 
-psVector* psVectorCopy(psVector* out, const psVector* in, psElemType type)
-{
-    if (in == NULL) {
+psVector* psVectorCopy(psVector* output, const psVector* input, psElemType type)
+{
+    if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psVector_SORT_NULL);
-        psFree(out);
-        return NULL;
-    }
-
-    psS32 nElements = in->n;
-
-    out = psVectorRecycle(out, nElements, type);
+        psFree(output);
+        return NULL;
+    }
+
+    psS32 nElements = input->n;
+
+    output = psVectorRecycle(output, nElements, type);
 
     #define PSVECTOR_COPY(INTYPE,OUTTYPE) { \
-        ps##INTYPE *inVec = in->data.INTYPE; \
-        ps##OUTTYPE *outVec = out->data.OUTTYPE; \
+        ps##INTYPE *inVec = input->data.INTYPE; \
+        ps##OUTTYPE *outVec = output->data.OUTTYPE; \
         for (psS32 col=0;col<nElements;col++) { \
             *(outVec++) = *(inVec++); \
@@ -189 +189 @@
     #define PSVECTOR_COPY_CASE(OUTTYPE) \
 case PS_TYPE_##OUTTYPE: { \
-        switch (in->type.type) { \
+        switch (input->type.type) { \
         case PS_TYPE_S8: \
             PSVECTOR_COPY(S8,OUTTYPE); \
@@ -232 +232 @@
                         PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, \
                         typeStr); \
-                psFree(out); \
+                psFree(output); \
             } \
         } \
@@ -257 +257 @@
                     PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE,
                     typeStr);
-            psFree(out);
+            psFree(output);
 
             break;
         }
     }
-    return out;
+    return output;