OSSP CVS Repository

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

ossp-pkg/rc/rc.c 1.29 -> 1.30

--- rc.c 2002/05/22 16:01:49     1.29
+++ rc.c 2002/05/29 12:42:08     1.30
@@ -48,17 +48,33 @@
         configVerify();     /* Test for usage, help, and version options  */
 
         pAnal = analNew();  /* Construct a new configuration analyser     */
+TRACE("BeforeAnalparse");
         analParse(pAnal);   /* Preprocess the analysed configuration      */
+TRACE("AfterAnalparse");
     }
     ex_catch(Except) {      /* Exceptions during configuration and analysis */
-        if ((rc_return_t)Except.ex_value == RC_ERR_USE)
+TRACE("Hopla1");
+        if ((rc_return_t)Except.ex_value == RC_ERR_USE) {
+TRACE("Hopla2");
             clioptPrintusage();
-        else
+TRACE("Hopla3");
+        }
+        else {
+TRACE("Hopla4");
             fprintf(stderr, "Class '%s' threw exception %d in %s:%s():%d.\n",\
                 (char *)Except.ex_class, (int)Except.ex_value,\
                 Except.ex_file, Except.ex_func, Except.ex_line);
-        if (FAILED((rc_return_t)Except.ex_value)) /* NOP on warnings */
+TRACE("Hopla5");
+        }
+TRACE("Hopla6");
+        if (FAILED((rc_return_t)Except.ex_value)) { /* NOP on warnings */
+TRACE("Hopla7");
             exit(1); /* Report failure and exit the program */
+TRACE("Hopla8");
+        }
+        else {
+TRACE("Hopla9");
+        }
     }
 
     ex_try { /* Main script building and processing block */
@@ -81,12 +97,12 @@
             exit(1); /* Report failure and exit the program */
     }
 
-    ex_try {           /* Start shutdown of main program */
+    ex_try {                /* 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)) {
+        if (FAILED((rc_return_t)Except.ex_value)) { /* NOP on warnings */
             fprintf(stderr, "Class '%s' threw exception %d in %s:%s():%d.\n",\
                 (char *)Except.ex_class, (int)Except.ex_value,\
                 Except.ex_file, Except.ex_func, Except.ex_line);

CVSTrac 2.0.1