Index: trunk/psLib/src/astro/psTime.c
===================================================================
--- trunk/psLib/src/astro/psTime.c	(revision 1272)
+++ trunk/psLib/src/astro/psTime.c	(revision 1385)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-22 21:24:54 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-04 23:37:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -100,27 +100,73 @@
 static double leapseconds[NUM_LEAPSECOND_UPDATES][2] =
     {
-        {2441317.5, 10.0},
-        {2441499.5, 11.0},
-        {2441683.5, 12.0},
-        {2442048.5, 13.0},
-        {2442413.5, 14.0},
-        {2442778.5, 15.0},
-        {2443144.5, 16.0},
-        {2443509.5, 17.0},
-        {2443874.5, 18.0},
-        {2444239.5, 19.0},
-        {2444786.5, 20.0},
-        {2445151.5, 21.0},
-        {2445516.5, 22.0},
-        {2446247.5, 23.0},
-        {2447161.5, 24.0},
-        {2447892.5, 25.0},
-        {2448257.5, 26.0},
-        {2448804.5, 27.0},
-        {2449169.5, 28.0},
-        {2449534.5, 29.0},
-        {2450083.5, 30.0},
-        {2450630.5, 31.0},
-        {2451179.5, 32.0}
+        {
+            2441317.5, 10.0
+        },
+        {
+            2441499.5, 11.0
+        },
+        {
+            2441683.5, 12.0
+        },
+        {
+            2442048.5, 13.0
+        },
+        {
+            2442413.5, 14.0
+        },
+        {
+            2442778.5, 15.0
+        },
+        {
+            2443144.5, 16.0
+        },
+        {
+            2443509.5, 17.0
+        },
+        {
+            2443874.5, 18.0
+        },
+        {
+            2444239.5, 19.0
+        },
+        {
+            2444786.5, 20.0
+        },
+        {
+            2445151.5, 21.0
+        },
+        {
+            2445516.5, 22.0
+        },
+        {
+            2446247.5, 23.0
+        },
+        {
+            2447161.5, 24.0
+        },
+        {
+            2447892.5, 25.0
+        },
+        {
+            2448257.5, 26.0
+        },
+        {
+            2448804.5, 27.0
+        },
+        {
+            2449169.5, 28.0
+        },
+        {
+            2449534.5, 29.0
+        },
+        {
+            2450083.5, 30.0
+        },
+        {
+            2450630.5, 31.0
+        },
+        {
+            2451179.5, 32.0
+        }
     };
 
@@ -395,13 +441,15 @@
         psError(__func__,"Null value for timeval arg not allowed");
         return outTime;
-    } else if(time->tv_sec < 0)
-    {
-        psError(__func__,"Negative seconds are not allowed: %ld", time->tv_sec);
-        return outTime;
-    } else if(time->tv_usec<0)
-    {
-        psError(__func__,"Negative microseconds are not allowed: %ld", time->tv_usec);
-        return outTime;
-    }
+    } else
+        if(time->tv_sec < 0)
+        {
+            psError(__func__,"Negative seconds are not allowed: %ld", time->tv_sec);
+            return outTime;
+        } else
+            if(time->tv_usec<0)
+            {
+                psError(__func__,"Negative microseconds are not allowed: %ld", time->tv_usec);
+                return outTime;
+            }
 
     // Convert to psTime/TAI
@@ -420,5 +468,8 @@
     int n;
     int y;
-    int mon [] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+    int mon [] =
+        {
+            31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+        };
     long epoch;
     psTime outTime;
@@ -433,29 +484,35 @@
         psError(__func__,"Null value for tm arg not allowed");
         return outTime;
-    } else if(time->tm_year < 70)
-    {
-        psError(__func__,"Input times earlier than 1970 not allowed. Value: %d", time->tm_year+1900);
-        return outTime;
-    } else  if(time->tm_mon<0 || time->tm_mon>11)
-    {
-        psError(__func__,"Month must have a value from 0 to 11. Value: %d", time->tm_mon);
-        return outTime;
-    } else if(time->tm_mday<1 || time->tm_mday>31)
-    {
-        psError(__func__,"Day must have a value from 1 to 31. Value: %d", time->tm_mday);
-        return outTime;
-    } else if(time->tm_hour<0 || time->tm_hour>23)
-    {
-        psError(__func__,"Hour must have a value from 0 to 23. Value: %d", time->tm_hour);
-        return outTime;
-    } else if(time->tm_min<0 || time->tm_min>59)
-    {
-        psError(__func__,"Minute must have a value from 0 to 59. Value: %d", time->tm_min);
-        return outTime;
-    } else if(time->tm_sec<0 || time->tm_sec>59)
-    {
-        psError(__func__,"Second must have a value from 0 to 59. Value: %d", time->tm_sec);
-        return outTime;
-    }
+    } else
+        if(time->tm_year < 70)
+        {
+            psError(__func__,"Input times earlier than 1970 not allowed. Value: %d", time->tm_year+1900);
+            return outTime;
+        } else
+            if(time->tm_mon<0 || time->tm_mon>11)
+            {
+                psError(__func__,"Month must have a value from 0 to 11. Value: %d", time->tm_mon);
+                return outTime;
+            } else
+                if(time->tm_mday<1 || time->tm_mday>31)
+                {
+                    psError(__func__,"Day must have a value from 1 to 31. Value: %d", time->tm_mday);
+                    return outTime;
+                } else
+                    if(time->tm_hour<0 || time->tm_hour>23)
+                    {
+                        psError(__func__,"Hour must have a value from 0 to 23. Value: %d", time->tm_hour);
+                        return outTime;
+                    } else
+                        if(time->tm_min<0 || time->tm_min>59)
+                        {
+                            psError(__func__,"Minute must have a value from 0 to 59. Value: %d", time->tm_min);
+                            return outTime;
+                        } else
+                            if(time->tm_sec<0 || time->tm_sec>59)
+                            {
+                                psError(__func__,"Second must have a value from 0 to 59. Value: %d", time->tm_sec);
+                                return outTime;
+                            }
 
     n = time->tm_year + 1900 - 1;