Index: trunk/psLib/test/astronomy/Makefile
===================================================================
--- trunk/psLib/test/astronomy/Makefile	(revision 2665)
+++ trunk/psLib/test/astronomy/Makefile	(revision 2681)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/astronomy
 ##
-##  $Revision: 1.23 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-11-30 00:28:36 $
+##  $Revision: 1.24 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-12-10 02:50:15 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -31,7 +31,7 @@
          tst_psMetadata_06 \
          tst_psMetadata_07 \
-         tst_psCoord \
          tst_psAstrometry \
          tst_psAstrometry01
+#         tst_psCoord \
 
 OBJS = $(addprefix builddir/,$(addsuffix .o,$(TARGET)))
Index: trunk/psLib/test/astronomy/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 2665)
+++ trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 2681)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-03 23:19:07 $
+*  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-12-10 02:50:15 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41,10 +41,11 @@
     psMetadataItem *entryChild = NULL;
 
-    psListSetIterator(metadataItemList, PS_LIST_HEAD);
-    entryChild = psListGetCurrent(metadataItemList);
-    while (entryChild != NULL) {
+    psListIterator* iter = psListIteratorAlloc(metadataItemList, PS_LIST_HEAD);
+
+    while ( (entryChild=psListGetNext(iter)) != NULL) {
         printMetadataItem(entryChild, spaces);
-        entryChild = psListGetNext(metadataItemList);
     }
+
+    psFree(iter);
 }
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 2665)
+++ trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 2681)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-12-03 23:19:07 $
+*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-12-10 02:50:15 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46,10 +46,12 @@
     psMetadataItem *entryChild = NULL;
 
-    psListSetIterator(metadataItemList, PS_LIST_HEAD);
-    entryChild = psListGetCurrent(metadataItemList);
-    while (entryChild != NULL) {
+    psListIterator* iter = psListIteratorAlloc(metadataItemList, PS_LIST_HEAD);
+
+    while ( (entryChild=psListGetNext(iter)) != NULL) {
         printMetadataItem(entryChild, spaces);
-        entryChild = psListGetNext(metadataItemList);
-    }
+    }
+
+    psFree(iter);
+
 }
 
Index: trunk/psLib/test/astronomy/tst_psTime_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_01.c	(revision 2665)
+++ trunk/psLib/test/astronomy/tst_psTime_01.c	(revision 2681)
@@ -23,6 +23,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-11-30 01:14:08 $
+ *  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-12-10 02:50:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,7 @@
     // Test B - Print test time
     printPositiveTestHeader(stdout,"psTime", "Print test time");
-    printf("Test time: Seconds = %lld Microseconds = %u\n", testTime->sec, testTime->usec);
+    printf("Test time: Seconds = %lld Microseconds = %u\n",
+           (long long int)testTime->sec,
+           testTime->usec);
     printFooter(stdout, "psTime", "Print test time", true);
 
@@ -75,5 +77,7 @@
     psTime *timeD = NULL;
     timeD = psTimeFromISOTime(isoString);
-    printf("psTime: Seconds = %lld Microseconds = %u\n", timeD->sec, timeD->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n",
+           (long long int)timeD->sec,
+           timeD->usec);
     psFree(isoString);
     psFree(timeD);
@@ -90,5 +94,7 @@
     timeE = psTimeConvert(timeE, PS_TIME_UTC);
     psFree(timeE);
-    printf("psTime: Seconds = %lld Microseconds = %u\n", timeE->sec, timeE->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n",
+           (long long int)timeE->sec,
+           timeE->usec);
     printFooter(stdout, "psTime", "Convert psTime time to UTC time", true);
 
@@ -103,5 +109,7 @@
     timeF = psTimeConvert(timeF, PS_TIME_TAI);
     psFree(timeF);
-    printf("psTime: Seconds = %lld Microseconds = %u\n", timeF->sec, timeF->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n",
+           (long long int)timeF->sec,
+           timeF->usec);
     printFooter(stdout, "psTime", "Convert UTC time to psTime", true);
 
@@ -119,5 +127,7 @@
     psTime *timeH = NULL;
     timeH = psTimeFromMJD(mjdTime);
-    printf("psTime: Seconds = %lld Microseconds = %u\n", timeH->sec, timeH->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n",
+           (long long int)timeH->sec,
+           timeH->usec);
     psFree(timeH);
     printFooter(stdout, "psTime", "Convert MJD time to psTime", true);
@@ -136,5 +146,7 @@
     psTime *timeJ = NULL;
     timeJ = psTimeFromJD(jdTime);
-    printf("psTime: Seconds = %lld Microseconds = %u\n", timeJ->sec, timeJ->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n",
+           (long long int)timeJ->sec,
+           timeJ->usec);
     psFree(timeJ);
     printFooter(stdout, "psTime", "Convert JD time to psTime", true);
@@ -145,5 +157,7 @@
     struct timeval timevalTime;
     timevalTime = psTimeToTimeval(testTime);
-    printf("timevalTime: Seconds = %lld Microseconds = %lld\n", (psS64)timevalTime.tv_sec, (psS64)timevalTime.tv_usec);
+    printf("timevalTime: Seconds = %lld Microseconds = %lld\n",
+           (long long int)timevalTime.tv_sec,
+           (long long int)timevalTime.tv_usec);
     printFooter(stdout, "psTime", "Convert psTime to timeval time", true);
 
@@ -153,5 +167,7 @@
     psTime *timeL = NULL;
     timeL = psTimeFromTimeval(&timevalTime);
-    printf("psTime: Seconds = %lld Microseconds = %u\n", timeL->sec, timeL->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n",
+           (long long int)timeL->sec,
+           timeL->usec);
     psFree(timeL);
     printFooter(stdout, "psTime", "Convert timeval time to psTime", true);
@@ -176,5 +192,7 @@
     psTime *timeN = NULL;
     timeN = psTimeFromTM(tmTime);
-    printf("psTime: Seconds = %lld Microseconds = %u\n", timeN->sec, timeN->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n",
+           (long long int)timeN->sec,
+           timeN->usec);
     psFree(timeN);
     psFree(tmTime);
Index: trunk/psLib/test/astronomy/tst_psTime_03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_03.c	(revision 2665)
+++ trunk/psLib/test/astronomy/tst_psTime_03.c	(revision 2681)
@@ -12,6 +12,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-11-22 20:52:45 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-12-10 02:50:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,5 +23,5 @@
 
 #define PRINT_TIME(TEXT,TIME) \
-printf("%s Seconds = %lld Microseconds = %u\n", TEXT, TIME->sec, TIME->usec);
+printf("%s Seconds = %lld Microseconds = %u\n", TEXT, (long long int)TIME->sec, TIME->usec);
 
 psS32 main(psS32 argc, char* argv[])