Changeset 6484 for trunk/psLib/src/types

Timestamp:

Feb 24, 2006, 1:43:16 PM (20 years ago)

Author:

drobbin

Message:

Changed psArray & psVector to zero 'n' upon allocation. Used to set vector->n = nalloc.

Location:

trunk/psLib/src/types

Files:

• psArray.c (modified) (3 diffs)
• psLookupTable.c (modified) (3 diffs)
• psMetadataConfig.c (modified) (2 diffs)

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-17 03:24:46 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-24 23:43:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
 
     P_PSARRAY_SET_NALLOC(psArr,nalloc);
-    psArr->n = 0;
-    //    psArr->n = nalloc;
+    psArr->n = 0;  //set the initial number of elements in use to 0
     // Create vector data array
     psArr->data = psAlloc(nalloc * sizeof(psPtr));
+    memset(psArr->data, 0, sizeof(void*) * nalloc);  //set the initial values of data to NULL
 
     return psArr;
@@ -86 +86 @@
         }
         // Realloc after decrementation to avoid accessing freed array elements
+        long n = in->n;
         in->data = psRealloc(in->data, nalloc * sizeof(psPtr));
         P_PSARRAY_SET_NALLOC(in,nalloc);
+        for (long m = n; m < nalloc; m++) { //if array is grown, set grown data to NULL
+            in->data[m] = NULL;
+        }
     }
 

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-17 03:24:46 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-02-24 23:43:15 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -600 +600 @@
     // Check if array is sorted on the index column
     psVector* sortedIndex = psVectorAlloc(numRows,PS_TYPE_U32);
+    sortedIndex->n = numRows;
     sortedIndex = psVectorSortIndex(sortedIndex,indexColumnVector);
     for(psS32 i = 0; i < numRows; i++ ) {
@@ -615 +616 @@
             psS32 type = ((psVector*)(vectors->data[j]))->type.type;
             newValueArray->data[j] = psVectorAlloc(numRows,type);
+            ((psVector*)(newValueArray->data[j]))->n = numRows;
             newValueArray->n++;
         }

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-25 22:33:41 $
+*  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-02-24 23:43:15 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -363 +363 @@
                         elemType);
             }
-
+            vec->n++;
             while(*end==' ' || *end==',') {
                 end++;