Changeset 13950 for trunk/psLib/src/sys/psConfigure.c

Timestamp:

Jun 21, 2007, 4:28:48 PM (19 years ago)

Author:

jhoblitt

Message:

change psLibInit() to return a boolean status
change psLibFinalize() to abort on error as psError() may not/should not be working after invoking this function
change psTimeInitialize() to return a bool status
change psTimeInitialize() to deffer the actual loading of the "time tables"
rename psTimeInitialize() -> psTimeInit()
rename p_psTimeConfigFileName() -> p_psTimeConfigFilename()
change p_psTimeConfigFilename() to accept a filename argument
p_psTimeConfigFilename() now either return's the current conf files name when passed NULL or sets it to the "filename" parameter that is passed in
change all psTime* functions to make sure that the "time tables" have been initalized before using them

File:

• trunk/psLib/src/sys/psConfigure.c (modified) (6 diffs)

trunk/psLib/src/sys/psConfigure.c

@@ -13 +13 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-06 00:04:15 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-22 02:28:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include <stdlib.h>
 #include <string.h>
+
+#include "psAbort.h"
 #include "psTrace.h"
 #include "psString.h"
@@ -94 +96 @@
 
 
-void psLibInit(const char* timeConfig)
+bool psLibInit(const char* timeConfig)
 {
     // XXX: Still needs error codes to be set
 
     if (timeConfig && strlen(timeConfig) > 0) {
-        if (!p_psTimeInit(timeConfig)) {
+        if (!psTimeInit(timeConfig)) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                     _("Failed to initialize %s."), "psTime");
-            return;
+            return false;
         }
     }
@@ -111 +113 @@
         atexit(&p_psMemoryCheck);
     }
+
+    return true;
 }
 
@@ -122 +126 @@
     // Free the time tables
     if (!p_psTimeFinalize()) {
-        psError(PS_ERR_UNKNOWN, false,
-                _("Failed to finalize %s."), "psTime");
-        return;
+        psAbort(_("Failed to finalize psTime."));
     }
 
     // Free the precession tables
     if (!p_psEOCFinalize()) {
-        psError(PS_ERR_UNKNOWN, false,
-                _("Failed to finalize %s."), "psEOC");
-        return;
+        psAbort(_("Failed to finalize psEOC."));
     }
 
@@ -139 +139 @@
     // Free the error system
     psErrorClear();
-
 }