OSSP CVS Repository

ossp - Check-in [3388]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 3388
Date: 2003-May-27 13:56:00 (local)
2003-May-27 11:56:00 (UTC)
User:ms
Branch:
Comment: Put throw logic back in where it was previously removed due to longjmp(3) problems.
Tickets:
Inspections:
Files:
ossp-pkg/rc/rc_script.c      1.22 -> 1.23     4 inserted, 8 deleted

ossp-pkg/rc/rc_script.c 1.22 -> 1.23

--- rc_script.c  2003/05/26 16:24:08     1.22
+++ rc_script.c  2003/05/27 11:56:00     1.23
@@ -84,8 +84,7 @@
     assert(pScript); /* Script parameter must be valid */
 
     if (!szInbuf) {
-TRACE("Problem with appendScript");
-/*        return(RC_THROW(RC_ERR_USE));*/
+        return(RC_THROW(RC_ERR_USE));
     }
 
     /* Short circuit in case of dumb noop call */
@@ -96,8 +95,7 @@
     nResize = (*pScript != NULL ? strlen(*pScript) : 0) + Size + 2;
     /* Don't trust realloc(3) in this case */
     if ((pvRealloc = calloc(1, (size_t)nResize)) == NULL) {
-TRACE("Problem with appendScript");
-/*        return(RC_THROW(RC_ERR_MEM));*/
+        return(RC_THROW(RC_ERR_MEM));
     }
 
     /* Coerce strings into one Script again */
@@ -332,8 +330,7 @@
         return(RC_THROW(RC_OK));
     }
     else
-        fprintf(stderr, "FIXME: Replace with a real ex_throw!\n");
-/*        return(RC_THROW(RC_ERR_USE));*/
+        return(RC_THROW(RC_ERR_USE));
 }
 
 /************************************************
@@ -345,8 +342,7 @@
     if (*pScript)
         free(*pScript);
     else {
-TRACE("Empty script created, unused, then destroyed");
-/*        RC_THROW(RC_WRN_NUL);*/
+        RC_THROW(RC_WRN_NUL);
     }
     free(pScript);
 

CVSTrac 2.0.1