Changeset 5524

Timestamp:

Nov 16, 2005, 10:52:23 AM (21 years ago)

Author:

drobbin

Message:

Fixed memory leaks from EOC Init fxn.

Location:

trunk/psLib

Files:

• src/astro/psEarthOrientation.c (modified) (2 diffs)
• src/sys/psConfigure.c (modified) (4 diffs)
• test/astro/tst_psEarthOrientation.c (modified) (3 diffs)
• test/astro/verified/tst_psEarthOrientation.stdout (modified) (1 diff)

trunk/psLib/src/astro/psEarthOrientation.c

@@ -8 +8 @@
 *  @author Robert Daniel DeSonia, MHPCC
 *
-*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-16 02:40:13 $
+*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-16 20:52:23 $
 *
 *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
@@ -165 +165 @@
     psFree(yCoeff);
     psFree(sCoeff);
+    psFree(eocMetadata);
 
     return true;

trunk/psLib/src/sys/psConfigure.c

@@ -13 +13 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:01 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-16 20:52:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include "psString.h"
 #include "psTime.h"
+#include "psEarthOrientation.h"
 #include "psError.h"
 #include "psConfigure.h"
@@ -43 +44 @@
         return;
     }
+    if(!p_psEOCInit()) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psConfigure_INITIALIZATION_FAILED, "psEOC");
+        return;
+    }
 }
 
@@ -54 +60 @@
         return;
     }
+    if(!p_psEOCFinalize()) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psConfigure_FINALIZATION_FAILED, "psEOC");
+        return;
+    }
 }

trunk/psLib/test/astro/tst_psEarthOrientation.c

@@ -5 +5 @@
 *  @author d-Rob, MHPCC
 *
-*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-16 02:40:13 $
+*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-16 20:52:23 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -171 +171 @@
     psFree(UT1time);
     //Check return values from valid precession input
-    /*
-        pmodel = psEOC_PrecessionModel(time);
-        if ( pmodel == NULL ) {
-            psError(PS_ERR_BAD_PARAMETER_NULL, false,
-                    "psEOC_PrecessionModel returned NULL for valid input.\n");
-            return 3;
-        } else {
-            printf("Precession Model output = x,y,s = %.8g, %.8g, %.8g\n",
-                   pmodel->x, pmodel->y, pmodel->s);
-        }
-        psFree(pmodel);
-    */
+
+    pmodel = psEOC_PrecessionModel(time);
+    if ( pmodel == NULL ) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, false,
+                "psEOC_PrecessionModel returned NULL for valid input.\n");
+        return 3;
+    } else {
+        printf("Precession Model output = x,y,s = %.8g, %.8g, %.8g\n\n",
+               pmodel->x, pmodel->y, pmodel->s);
+    }
+    psFree(pmodel);
+
 
     //Tests for Precession Correction function//
@@ -228 +228 @@
 
     psFree(time);
-    /*    if (!p_psEOCFinalize() ) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "EOC failed finalization!\n");
-            return 12;
-        }
-    */
+    if (!p_psEOCFinalize() ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false, "EOC failed finalization!\n");
+        return 12;
+    }
+
     return 0;
 }

trunk/psLib/test/astro/verified/tst_psEarthOrientation.stdout

@@ -3 +3 @@
 
 Actual r,d = 0.61001,0.01999    Apparent r,d = 0.6100100000001365, 0.01999000000006505 
+Precession Model output = x,y,s = 1.1557751e+08, 8865375.4, -5.1231901e+14
+
 Precession Correction output (IERSA) = x,y,s = 0.26026728, 0.26026728, -0.61282361
 Precession Correction output (IERSB) = x,y,s = 0.26026728, 0.26026728, 0