OSSP CVS Repository

ossp - Difference in ossp-pkg/rc/rc.c versions 1.44 and 1.45
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/rc/rc.c 1.44 -> 1.45

--- rc.c 2003/07/07 13:30:51     1.44
+++ rc.c 2003/07/11 14:13:16     1.45
@@ -38,22 +38,23 @@
 int main(int argc, char *argv[])
 {
     ex_t Except;
+    rc_config_t *pConf = NULL;
+    rc_proc_t *pProc = NULL;
 
     try {                       /* Configuration block, config is built here  */
-        configNew();            /* Construct a new config, add default values */
-        configLoad(argc, (const char **)argv);   /* Load cli, env, and conf   */
-        configDefaults();       /* Add default values to empty config members */
+        pConf = configNew();    /* Construct a new config, add default values */
+        configLoad(pConf, argc, (const char **)argv); /* Load cli, env, conf  */
+        configDefaults(pConf);  /* Add default values to empty config members */
     }
     catch(Except)               /* Exceptions of the configuration block      */
         rcError(Except);
 
     try {                       /* Main processing block, script built */
-        rc_proc_t *pProc = NULL;
         pProc = procNew();      /* Construct a new processor           */
         procPopulate(pProc);    /* Populate with run commands          */
         procRun(pProc);         /* [Execute|Evaluate|Print] script     */
         procDelete(pProc);      /* Destroy the processor               */
-        configDelete();         /* Destroy the configuration           */
+        configDelete(pConf);    /* Destroy the configuration           */
     }
     catch(Except)               /* Exceptions while script processing  */
         rcError(Except);

CVSTrac 2.0.1