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

Timestamp:

May 13, 2004, 1:36:27 PM (22 years ago)

Author:

desonia

Message:

moved the type stuff from psVector to psType.h, enhanced the PSELEMTYPE_SIZEOF macro to handle PS_TYPE_PTR, etc.

File:

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

trunk/psLib/src/collections/psVector.c

@@ -19 +19 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-13 22:47:52 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-13 23:36:27 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -75 +75 @@
     }
 
-    if (elemType == PS_TYPE_PTR) {
-        elementSize = sizeof(void*);
-    } else {
-        elementSize = PSELEMTYPE_SIZEOF(elemType);
-    }
+    elementSize = PSELEMTYPE_SIZEOF(elemType);
 
     // Create vector struct
@@ -102 +98 @@
     // Invalid nalloc
     if(nalloc < 1) {
-        psError(__func__, " : Line %d - Invalid value for nalloc. nalloc: %d\n", __LINE__, nalloc);
+        psError(__func__, "Invalid value for nalloc (%d)\n", nalloc);
         return NULL;
     }
 
-    if (elemType == PS_TYPE_PTR) {
-        elementSize = sizeof(void*);
-    } else {
-        elementSize = PSELEMTYPE_SIZEOF(elemType);
-    }
+    elementSize = PSELEMTYPE_SIZEOF(elemType);
 
 
@@ -137 +129 @@
     }
 
-    if (psVec->type.type == PS_TYPE_PTR) {
-        psLogMsg(__func__,PS_LOG_WARN,"psVectorFree was called with a void* vector. "
-                 "Referenced of pointers was not freed.");
-        psVoidPtrVectorFree(psVec,NULL);
-    } else {
-        psFree(psVec->vec.v);
-        psFree(psVec);
-    }
+    psFree(psVec->vec.v);
+    psFree(psVec);
 }