Changeset 15708

Timestamp:

Nov 28, 2007, 3:27:47 PM (18 years ago)

Author:

gusciora

Message:

Removed bug with the psFitsTable().

File:

• trunk/psLib/test/fits/tap_psFits.c (modified) (9 diffs)

trunk/psLib/test/fits/tap_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-06-13 23:33:22 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-11-29 01:27:47 $
 *
 *  XXXX: All of the makeTable() tests are failing, as well as one additional one.
@@ -93 +93 @@
 bool makeTable(void)
 {
+// XXX: Should we be checking for memory leaks in this function?
+//    psMemId id = psMemGetId();
     psFits* fitsFile = psFitsOpen(tableFilename, "w");
     if (fitsFile == NULL) {
@@ -146 +148 @@
         for (int x=0; x < 4; x++) {
             vec->data.S32[x] = x*10+row;
-            vec->n++;
         }
         psMetadataAdd(header,PS_LIST_TAIL, "MYVEC",
@@ -155 +156 @@
 
         table->data[row] = header;
-        table->n++;
-    }
-
-    printf("XXX: The following call to psFitsWriteTable() seg faults\n");
-    psFitsWriteTable(fitsFile, NULL, table, NULL);
+    }
+
+    bool rc = psFitsWriteTable(fitsFile, NULL, table, NULL);
 
     psFree(table);
     psFree(fitsFile);
-    return (!psMemCheckLeaks(15,NULL,stderr,false));
+    return(rc);
 }
 
@@ -674 +673 @@
 
     // tst_psFitsReadTable()
-    // XXXX: This is if'ed out because the call to makeTable() is seg faulting
-    if (0) {
+    if (1) {
         psMemId id = psMemGetId();
         ok(makeTable(), "Created 'table' FITS file");
@@ -739 +737 @@
     }
 
-
     // tst_psFitsReadTableColumnNum()
-    // XXXX: This is if'ed out because the call to makeTable() is seg faulting
-    if (0) {
+    if (1) {
         psMemId id = psMemGetId();
         ok(makeTable(), "Created 'table' FITS file");
@@ -812 +808 @@
 
     // tst_psFitsReadTableColumn()
-    // XXXX: This is if'ed out because the call to makeTable() is seg faulting
-    if (0) {
+    if (1) {
         psMemId id = psMemGetId();
         ok(makeTable(), "Created 'table' FITS file");
@@ -899 +894 @@
 
     // tst_psFitsUpdateTable()
-    // XXXX: This is if'ed out because the call to makeTable() is seg faulting
-    if (0) {
+    if (1) {
         psMemId id = psMemGetId();
         psErr* err;
@@ -929 +923 @@
             psMetadataAddBool(md,PS_LIST_TAIL,"MYBOOL", 0,"",((row & 1) == 1));
             psMetadataAddStr(md,PS_LIST_TAIL,"MYSTR", 0,"",strValue[row]);
-
-
-
-
-
-
-
-
-
-
-
-
-
 
             if (!psFitsUpdateTable(fits,md,row)) {