Changeset 2322

Timestamp:

Nov 10, 2004, 12:39:18 PM (22 years ago)

Author:

harman

Message:

Updated print statements for 64 bit compatibility

File:

• trunk/psLib/test/astronomy/tst_psTime_01.c (modified) (12 diffs)

trunk/psLib/test/astronomy/tst_psTime_01.c

@@ -19 +19 @@
  *     N) Convert tm time to psTime
  *     O) Convert psTime time to LST
- *     P) Free psMetadata
+ *     P) Free data
  *
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-27 00:57:33 $
+ *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-11-10 22:39:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
     // Test B - Print test time
     printPositiveTestHeader(stdout,"psTime", "Print test time");
-    printf("Test time: Seconds = %ld Microseconds = %ld\n", (psS64)testTime->sec, (psS64)testTime->usec);
+    printf("Test time: Seconds = %lld Microseconds = %u\n", testTime->sec, testTime->usec);
     printFooter(stdout, "psTime", "Print test time", true);
 
@@ -75 +75 @@
     psTime *timeD = NULL;
     timeD = psTimeFromISOTime(isoString);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeD->sec, (psU32)timeD->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n", timeD->sec, timeD->usec);
     psFree(isoString);
     psFree(timeD);
@@ -90 +90 @@
     timeE = psTimeConvert(timeE, PS_TIME_UTC);
     psFree(timeE);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeE->sec, (psU32)timeE->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n", timeE->sec, timeE->usec);
     printFooter(stdout, "psTime", "Convert psTime time to UTC time", true);
 
@@ -103 +103 @@
     timeF = psTimeConvert(timeF, PS_TIME_TAI);
     psFree(timeF);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeF->sec, (psU32)timeF->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n", timeF->sec, timeF->usec);
     printFooter(stdout, "psTime", "Convert UTC time to psTime", true);
 
@@ -119 +119 @@
     psTime *timeH = NULL;
     timeH = psTimeFromMJD(mjdTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeH->sec, (psU32)timeH->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n", timeH->sec, timeH->usec);
     psFree(timeH);
     printFooter(stdout, "psTime", "Convert MJD time to psTime", true);
@@ -136 +136 @@
     psTime *timeJ = NULL;
     timeJ = psTimeFromJD(jdTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeJ->sec, (psU32)timeJ->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n", timeJ->sec, timeJ->usec);
     psFree(timeJ);
     printFooter(stdout, "psTime", "Convert JD time to psTime", true);
@@ -145 +145 @@
     struct timeval timevalTime;
     timevalTime = psTimeToTimeval(testTime);
-    printf("timevalTime: Seconds = %ld Microseconds = %ld\n", (psS64)timevalTime.tv_sec, (psS64)timevalTime.tv_usec);
+    printf("timevalTime: Seconds = %lld Microseconds = %ld\n", (psS64)timevalTime.tv_sec, (psS64)timevalTime.tv_usec);
     printFooter(stdout, "psTime", "Convert psTime to timeval time", true);
 
@@ -153 +153 @@
     psTime *timeL = NULL;
     timeL = psTimeFromTimeval(&timevalTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeL->sec, (psU32)timeL->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n", timeL->sec, timeL->usec);
     psFree(timeL);
     printFooter(stdout, "psTime", "Convert timeval time to psTime", true);
@@ -176 +176 @@
     psTime *timeN = NULL;
     timeN = psTimeFromTM(tmTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeN->sec, (psU32)timeN->usec);
+    printf("psTime: Seconds = %lld Microseconds = %u\n", timeN->sec, timeN->usec);
     psFree(timeN);
     psFree(tmTime);
@@ -193 +193 @@
 
 
-    // Test P - Free psMetadata
-    printPositiveTestHeader(stdout, "psMetadata", "Test P - Free psMetadata");
+    // Test P - Free data
+    printPositiveTestHeader(stdout, "psMetadata", "Test P - Free data");
     psFree(testTime);
+    psLibFinalize();
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
@@ -202 +203 @@
         printf("ERROR: Found %d bad memory blocks\n", nBad);
     }
-    printFooter(stdout, "psMetadata", "Test P - Free psMetadata", true);
+    printFooter(stdout, "psMetadata", "Test P - Free data", true);
 
     return 0;