Index: trunk/psLib/src/astro/psTime.c
===================================================================
--- trunk/psLib/src/astro/psTime.c	(revision 4330)
+++ trunk/psLib/src/astro/psTime.c	(revision 4409)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-28 20:17:52 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1166,5 +1166,5 @@
 }
 
-char* psTimeToISO(const psTime *time)
+psString psTimeToISO(const psTime *time)
 {
     psS32 ds = 0;
@@ -1353,5 +1353,5 @@
 }
 
-psTime* psTimeFromISO(const char *time)
+psTime* psTimeFromISO(const char *input)
 {
     psS32 millisecond;
@@ -1360,10 +1360,10 @@
 
     // Check for NULL string
-    PS_ASSERT_PTR_NON_NULL(time,NULL);
+    PS_ASSERT_PTR_NON_NULL(input,NULL);
 
     // Convert YYYY-MM-DDThh:mm:ss.sss in string form to tm time
-    if (sscanf(time, "%d-%d-%dT%d:%d:%d,%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday,
+    if (sscanf(input, "%d-%d-%dT%d:%d:%d,%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday,
                &tmTime.tm_hour, &tmTime.tm_min, &tmTime.tm_sec,&millisecond) < 7) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, time);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, input);
         return NULL;
     }
@@ -1426,5 +1426,5 @@
 }
 
-psTime* psTimeFromTimeval(const struct timeval *time)
+psTime* psTimeFromTimeval(const struct timeval *input)
 {
     psTime *outTime = NULL;
@@ -1432,5 +1432,5 @@
 
     // Error check
-    PS_ASSERT_PTR_NON_NULL(time,NULL);
+    PS_ASSERT_PTR_NON_NULL(input,NULL);
 
     // Allocate psTime struct
@@ -1438,6 +1438,6 @@
 
     // Convert to psTime
-    outTime->sec = time->tv_sec;
-    outTime->nsec = time->tv_usec * 1000;
+    outTime->sec = input->tv_sec;
+    outTime->nsec = input->tv_usec * 1000;
 
     // Error check