Changeset 8627 for trunk/psLib/src/astro/psTime.c

Timestamp:

Aug 25, 2006, 6:34:28 PM (20 years ago)

Author:

jhoblitt

Message:

add gcc format attributes to:

psAbort()
psErrorStackPrint()
p_psError()
p_psWarning()
psLogMsg()
p_psTrace()

add PS_ASSERT_LONG_LARGER_THAN_OR_EQUAL
add PS_ASSERT_S64_WITHIN_RANGE
fix PS_ASSERT_LONG_WITHIN_RANGE
fix a wide range of format related issues:

• missing format field specifiers
• missing format args
• incorrect format field specifiers
• constants declared with the wrong type (float vs. int)
• PS_ASSERT* for the wrong type
• attemps to print structs with *printf()
• unportable format specifiers, eg. long vs. long long

File:

• trunk/psLib/src/astro/psTime.c (modified) (7 diffs)

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:22 $
+ *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:27 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
 
 // Offset of year 0000 from epoch
-#define YEAR_0000_SEC                 -62125920000.0
+#define YEAR_0000_SEC                 -62125920000
 
 // Offset of year 9999 from epoch
-#define YEAR_9999_SEC                 253202544000.0
+#define YEAR_9999_SEC                 253202544000
 
 /** Static function prototypes */
@@ -299 +299 @@
     if(tablesFrom->n != numTables) {
         p_psMemAllocatePersistent(initialPersistence);
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %d, Expected %d."), tablesFrom->n, numTables);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %ld, Expected %d."), tablesFrom->n, numTables);
         psFree(tablesFrom);
         return false;
@@ -316 +316 @@
     if(tablesTo->n != numTables) {
         p_psMemAllocatePersistent(initialPersistence);
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %d, Expected %d."), tablesTo->n, numTables);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %ld, Expected %d."), tablesTo->n, numTables);
         psFree(tablesFrom);
         psFree(tablesTo);
@@ -335 +335 @@
     if(tablesIndex->n != numTables) {
         p_psMemAllocatePersistent(initialPersistence);
-        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Incorrect vector size. Size: %d, Expected %d."),tablesIndex->n,numTables);
+        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Incorrect vector size. Size: %ld, Expected %d."),tablesIndex->n,numTables);
         psFree(tablesFrom);
         psFree(tablesTo);
@@ -1357 +1357 @@
 
     // Check valid year range
-    PS_ASSERT_LONG_WITHIN_RANGE(time->sec,YEAR_0000_SEC,YEAR_9999_SEC,NULL)
+    PS_ASSERT_S64_WITHIN_RANGE(time->sec, (psS64)YEAR_0000_SEC, (psS64)YEAR_9999_SEC, NULL);
 
     // Allocate temp strings
@@ -1727 +1727 @@
     // Create output time
     sec = delta + (psF64)tempTime->sec + (psF64)tempTime->nsec/1e9;
-    PS_ASSERT_LONG_WITHIN_RANGE((psS64)sec,0,PS_MAX_S64,outTime);
+    PS_ASSERT_S64_WITHIN_RANGE((psS64)sec, (psS64)0, PS_MAX_S64, NULL);
     outTime->sec = (psS64)sec;
     outTime->nsec = (psU32)((sec - (psF64)outTime->sec)*1e9);
 
     // Error check
-    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,(psU32)((1e9)-1),outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,(psU32)((1e9)-1), NULL);
 
     // Convert result to same time type as input