tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c jk_config.c jk_env.c jk_handler_logon.c jk_requtil.c jk_uriEnv.c jk_worker_ajp13.c
Date Thu, 23 May 2002 14:54:07 GMT
jfclere     02/05/23 07:54:07

  Modified:    jk/native2/common jk_channel_socket.c jk_config.c jk_env.c
                        jk_handler_logon.c jk_requtil.c jk_uriEnv.c
                        jk_worker_ajp13.c
  Log:
  Arrange comments for Solaris8 native compiler.
  
  Revision  Changes    Path
  1.28      +2 -2      jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
  
  Index: jk_channel_socket.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jk_channel_socket.c	16 May 2002 21:03:44 -0000	1.27
  +++ jk_channel_socket.c	23 May 2002 14:54:07 -0000	1.28
  @@ -250,7 +250,7 @@
                                               jk_channel_t *ch,
                                               jk_endpoint_t *endpoint)
   {
  -//    int err;
  +/*    int err; */
       jk_channel_socket_private_t *socketInfo=
   	(jk_channel_socket_private_t *)(ch->_privatePtr);
   
  @@ -588,7 +588,7 @@
   
       result->setAttribute= jk2_channel_socket_setAttribute; 
   
  -    //result->getAttributeInfo=jk2_channel_socket_getAttributeInfo;
  +    /*result->getAttributeInfo=jk2_channel_socket_getAttributeInfo;*/
       result->multiValueInfo=jk2_channel_socket_multiValueInfo;
       result->setAttributeInfo=jk2_channel_socket_setAttributeInfo;
       
  
  
  
  1.21      +5 -5      jakarta-tomcat-connectors/jk/native2/common/jk_config.c
  
  Index: jk_config.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- jk_config.c	22 May 2002 23:40:36 -0000	1.20
  +++ jk_config.c	23 May 2002 14:54:07 -0000	1.21
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: General purpose config object                                 *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.20 $                                           *
  + * Version:     $Revision: 1.21 $                                           *
    ***************************************************************************/
   
   #include "jk_global.h"
  @@ -96,7 +96,7 @@
                                     char *workerFile)
   {
       FILE *fp;
  -//    char buf[LENGTH_OF_LINE + 1];            
  +/*    char buf[LENGTH_OF_LINE + 1];            */
       int i,j;
   
       if( workerFile==NULL )
  @@ -168,9 +168,9 @@
       jk_bean_t *w = NULL;
       char *type=NULL;
       char *dot=0;
  -//    int i;
  -//    char **comp;
  -//    int nrComp;
  +/*    int i; */
  +/*    char **comp; */
  +/*    int nrComp; */
       char *lastDot;
       char *lastDot1;
       
  
  
  
  1.27      +2 -2      jakarta-tomcat-connectors/jk/native2/common/jk_env.c
  
  Index: jk_env.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- jk_env.c	16 May 2002 23:48:27 -0000	1.26
  +++ jk_env.c	23 May 2002 14:54:07 -0000	1.27
  @@ -154,7 +154,7 @@
   static jk_bean_t *jk2_env_createBean( jk_env_t *env, jk_pool_t *pool, char *objName )
   {
       char *type=NULL;
  -//    void *obj;
  +/*    void *obj; */
       char *localName;
   
       localName=strchr( objName, ':' );
  @@ -406,7 +406,7 @@
                                  const char *fmt, ... )
   {
       va_list args;
  -//    char *buf;
  +/*    char *buf; */
   
       va_start(args, fmt);
       env->l->jkVLog(env, env->l, file, line, JK_LOG_ERROR_LEVEL, fmt, args );
  
  
  
  1.17      +2 -2      jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
  
  Index: jk_handler_logon.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- jk_handler_logon.c	15 May 2002 19:45:45 -0000	1.16
  +++ jk_handler_logon.c	23 May 2002 14:54:07 -0000	1.17
  @@ -58,7 +58,7 @@
   /**
    * Description: AJP14 Login handler
    * Author:      Henri Gomez <hgomez@slib.fr>
  - * Version:     $Revision: 1.16 $                                          
  + * Version:     $Revision: 1.17 $                                          
    */
   
   #include "jk_global.h"
  @@ -173,7 +173,7 @@
   {
       unsigned long nego;
       char *sname;
  -//    int rc;
  +/*    int rc; */
   
       nego = msg->getLong(env, msg);
       
  
  
  
  1.19      +3 -3      jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
  
  Index: jk_requtil.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- jk_requtil.c	18 May 2002 22:35:36 -0000	1.18
  +++ jk_requtil.c	23 May 2002 14:54:07 -0000	1.19
  @@ -929,9 +929,9 @@
   
   int jk_requtil_base64CertLen(int len)
   {
  -    int n = ((len + 2) / 3 * 4) + 1; // base64 encoded size
  -    n += (n + 63 / 64) * 2; // add CRLF's
  -    n += sizeof(begin_cert) + sizeof(end_cert) - 2;  // add enclosing strings.
  +    int n = ((len + 2) / 3 * 4) + 1; /* base64 encoded size */
  +    n += (n + 63 / 64) * 2; /* add CRLF's */
  +    n += sizeof(begin_cert) + sizeof(end_cert) - 2; /* add enclosing strings. */
       return n;
   }
   
  
  
  
  1.22      +3 -3      jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
  
  Index: jk_uriEnv.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jk_uriEnv.c	16 May 2002 23:48:27 -0000	1.21
  +++ jk_uriEnv.c	23 May 2002 14:54:07 -0000	1.22
  @@ -100,7 +100,7 @@
       
       /* If it doesn't start with /, it must have a vhost */
       if( *name != '/' ) {
  -        // char *portIdx=strchr( n, ':' );
  +        /* char *portIdx=strchr( n, ':' ); */
           uriEnv->virtual=uriEnv->pool->calloc( env, uriEnv->pool, slash - name
+ 2 );
           strncpy( uriEnv->virtual, name, slash-name );
       }
  @@ -193,7 +193,7 @@
   
   static int jk2_uriEnv_init(jk_env_t *env, jk_uriEnv_t *uriEnv)
   {
  -//    int err;
  +/*    int err; */
       char *asterisk;
       char *uri=uriEnv->pool->pstrdup( env, uriEnv->pool, uriEnv->uri);
   
  @@ -247,7 +247,7 @@
   
       asterisk = strchr(uri, '*');
   
  -    // set the mapping type
  +    /* set the mapping type */
       if (!asterisk) {
           /* Something like:  JkMount /login/j_security_check ajp13 */
           uriEnv->prefix      = uri;
  
  
  
  1.25      +1 -1      jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
  
  Index: jk_worker_ajp13.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- jk_worker_ajp13.c	18 May 2002 22:43:27 -0000	1.24
  +++ jk_worker_ajp13.c	23 May 2002 14:54:07 -0000	1.25
  @@ -764,7 +764,7 @@
               e= ajp13->endpointCache->get( env, ajp13->endpointCache );
               
               if( e==NULL ) {
  -                // we finished all endpoints in the cache
  +                /* we finished all endpoints in the cache */
                   break;
               }
               
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message