Index: trunk/psLib/src/db/psDB.c
===================================================================
--- trunk/psLib/src/db/psDB.c	(revision 9690)
+++ trunk/psLib/src/db/psDB.c	(revision 9730)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-21 01:09:37 $
+ *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:52:55 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -395,6 +395,5 @@
     // then reset n to 0 so elements are added from the beginning of
     // the array
-    column = psArrayAlloc(rowCount);
-    column->n = 0;
+    column = psArrayAllocEmpty(rowCount);
 
     // Fetch each result
@@ -459,51 +458,39 @@
 
     psVector *column = psVectorAlloc(stringColumn->n, type);
-    //    column->n = column->nalloc;
 
     // conversion functions are a portability issue
     switch (type) {
     case PS_TYPE_S8:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.S8, stringColumn, atoi, psS8, PS_TYPE_S8);
         break;
     case PS_TYPE_S16:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.S16, stringColumn, atoi, psS16, PS_TYPE_S16);
         break;
     case PS_TYPE_S32:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.S32, stringColumn, atoi, psS32, PS_TYPE_S32);
         break;
     case PS_TYPE_S64:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.S64, stringColumn, atoll, psS64, PS_TYPE_S64);
         break;
     case PS_TYPE_U8:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.U8, stringColumn, atoi, psU8, PS_TYPE_U8);
         break;
     case PS_TYPE_U16:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.U16, stringColumn, atoi, psU16, PS_TYPE_U16);
         break;
     case PS_TYPE_U32:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.U32, stringColumn, atoi, psU32, PS_TYPE_U32);
         break;
     case PS_TYPE_U64:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.U64, stringColumn, atoll, psU64, PS_TYPE_U64);
         break;
     case PS_TYPE_F32:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.F32, stringColumn, atof, psF32, PS_TYPE_F32);
         break;
     case PS_TYPE_F64:
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.F64, stringColumn, atof, psF64, PS_TYPE_F64);
         break;
     case PS_TYPE_C32:
         // this is a bogus SQL type
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.C32, stringColumn, atof, psC32, PS_TYPE_C32);
         break;
@@ -514,5 +501,4 @@
     case PS_TYPE_BOOL:
         // valid for psVector?
-        column->n = column->nalloc;
         PS_STR_ARRAY_TO_PTYPE(column->data.U8, stringColumn, atoi, psU8, PS_TYPE_U8);
         break;
@@ -567,6 +553,5 @@
 
     // Create array to store single row
-    psArray *rowSet = psArrayAlloc(1);
-    rowSet->n = 0;
+    psArray *rowSet = psArrayAllocEmpty(1);
     psArrayAdd(rowSet, 0, (psPtr)row);
 
@@ -697,5 +682,5 @@
     }
 
-    psArray *rowData = psArrayAlloc(1);
+    psArray *rowData = psArrayAllocEmpty(1);
     psArrayAdd(rowData, 0, values);
     long rowsAffected = p_psDBRunQueryPrepared(dbh, rowData, query);
@@ -966,5 +951,5 @@
     // then reset n to 0 so elements are added from the beginning of
     // the array
-    resultSet = psArrayAlloc(rowCount);
+    resultSet = psArrayAllocEmpty(rowCount);
 
     field = mysql_fetch_fields(result);
@@ -1304,5 +1289,5 @@
     // Reset iterator to head of list
     psListIteratorSet(cursor, 0);
-    psArray *pKeys = psArrayAlloc(1);
+    psArray *pKeys = psArrayAllocEmpty(1);
     while ((item = psListGetAndIncrement(cursor))) {
         if (strstr(item->comment, "Primary Key")) {