ossp-pkg/rc/rc.c 1.28 -> 1.29
--- rc.c 2002/05/22 14:32:20 1.28
+++ rc.c 2002/05/22 16:01:49 1.29
@@ -41,16 +41,16 @@
ex_t Except;
rc_anal_t *pAnal = NULL; /* Holds preprocessed configuration */
- ex_try { /* Configuration and abstract analysis block */
- configNew(); /* Construct a new configuration */
+ ex_try { /* Configuration and abstract analysis block */
+ configNew(); /* Construct a new configuration */
configLoad(argc, (const char **)argv); /* Load cli, env, and conf */
- configDebug(); /* FIXME Remove FIXME */
- configVerify(); /* Test for usage, help, and version options */
+ configDebug(); /* FIXME Remove FIXME */
+ configVerify(); /* Test for usage, help, and version options */
-/* pAnal = analNew();*/ /* Construct a new analyzer */
-/* analParse(pAnal);*/ /* Preprocess the analyzed configuration */
+ pAnal = analNew(); /* Construct a new configuration analyser */
+ analParse(pAnal); /* Preprocess the analysed configuration */
}
- ex_catch(Except) { /* Exceptions thrown during configuration and analysis */
+ ex_catch(Except) { /* Exceptions during configuration and analysis */
if ((rc_return_t)Except.ex_value == RC_ERR_USE)
clioptPrintusage();
else
@@ -63,7 +63,7 @@
ex_try { /* Main script building and processing block */
/* rc_script_t *pScript = NULL;*/
- rc_proc_t *pProc = NULL;
+/* rc_proc_t *pProc = NULL;*/
/* pScript = scriptNew(pAnal);*/ /* Construct a new script */
/* scriptBuild(pScript);*/
@@ -81,9 +81,9 @@
exit(1); /* Report failure and exit the program */
}
- ex_try { /* Start shutdown of main program */
-/* analDelete(pAnal);*/ /* Destroy the analyzer */
- configDelete(); /* Destroy the configuration */
+ ex_try { /* Start shutdown of main program */
+ analDelete(pAnal); /* Destroy the analyser */
+ configDelete(); /* Destroy the configuration */
}
ex_catch(Except) { /* Error exceptions thrown during program shutdown */
if (FAILED((rc_return_t)Except.ex_value)) {
|
|
