You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2002/04/05 10:13:27 UTC

cvs commit: tcl-websh/src/generic interpool.c

ronnie      02/04/05 00:13:27

  Modified:    src/generic interpool.c
  Log:
  - removed unnecessary check and don't destroyPool on error
    (The state we're in when we have an error is very unclear
    and it should be checked eventually, but for normal operation
    this doesn't matter)
  
  Revision  Changes    Path
  1.13      +2 -11     tcl-websh/src/generic/interpool.c
  
  Index: interpool.c
  ===================================================================
  RCS file: /home/cvs/tcl-websh/src/generic/interpool.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- interpool.c	27 Mar 2002 11:42:31 -0000	1.12
  +++ interpool.c	5 Apr 2002 08:13:27 -0000	1.13
  @@ -9,7 +9,7 @@
    * See the file "license.terms" for information on usage and
    * redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    *
  - * @(#) $Id: interpool.c,v 1.12 2002/03/27 11:42:31 davidw Exp $
  + * @(#) $Id: interpool.c,v 1.13 2002/04/05 08:13:27 ronnie Exp $
    *
    */
   
  @@ -484,14 +484,6 @@
    * ------------------------------------------------------------------------- */
   int initPool(websh_server_conf * conf)
   {
  -    static called = 0;
  -
  -    if (called == 1) {
  -	return 1;
  -    } else {
  -	called = 1;
  -    }
  -
       Tcl_FindExecutable(NULL);
   
       if (conf->mainInterp != NULL || conf->webshPool != NULL) {
  @@ -502,8 +494,7 @@
   	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, conf->server,
   		     "initPool: mainInterp or webshPool not NULL\n");
   #endif /* APACHE2 */
  -	destroyPool(conf);
  -return 0;
  +	return 0;
       }
   
       /* create a single main interpreter */
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org