Changeset 6445 for trunk/psLib/src/fits/psFitsTable.c

Timestamp:

Feb 16, 2006, 5:24:47 PM (20 years ago)

Author:

drobbin

Message:

Changed psArrayAlloc to set ->n = 0. Updated corresponding functions & tests.

File:

• trunk/psLib/src/fits/psFitsTable.c (modified) (6 diffs)

trunk/psLib/src/fits/psFitsTable.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-08 01:03:34 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-17 03:24:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -595 +595 @@
         psTrace(".psFits.psFitsReadTable",5,"Reading row %i of %i\n",row, numRows);
         table->data[row] = psFitsReadTableRow(fits,row);
+        table->n++;
     }
 
@@ -658 +659 @@
                         psMemDecrRefCounter(fItem);
                         columns->data[n] = psMemIncrRefCounter(item);
+                        columns->n++;
 
                     } else if (item->type == PS_DATA_VECTOR &&
@@ -663 +665 @@
                         psMemDecrRefCounter(fItem);
                         columns->data[n] = psMemIncrRefCounter(item);
+                        columns->n++;
                     }
                 } else {
@@ -686 +689 @@
 
     //create list of column names and types.
+    columns->n--;
     psArray* columnNames = psArrayAlloc(columns->n);
     psArray* columnTypes = psArrayAlloc(columns->n);
     for (int n=0; n < columns->n; n++) {
         columnNames->data[n] = psMemIncrRefCounter(((psMetadataItem*)columns->data[n])->name);
+        columnNames->n++;
+        columnTypes->n++;
         if ( ! getMetadataTForm((psMetadataItem*)columns->data[n],
                                 (char**)&(columnTypes->data[n]),1) ) {
@@ -754 +760 @@
                                                    table->data[row],
                                                    item->name));
+                colArray->n++;
             }
             fits_write_col_str(fits->fd,