cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h

2001-09-05 Thread jfclere

jfclere 01/09/05 10:05:24

  Modified:jk/native/apache-2.0 mod_jk.c
   jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h
  Log:
  Get ride of some warnings - But there is still a lot to do with const -
  I have put /* DIRTY */ where the cast looks weird.
  
  Revision  ChangesPath
  1.21  +65 -51jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_jk.c  2001/09/05 14:43:48 1.20
  +++ mod_jk.c  2001/09/05 17:05:23 1.21
  @@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author:  Gal Shachor [EMAIL PROTECTED]   *
* Henri Gomez [EMAIL PROTECTED]   *
  - * Version: $Revision: 1.20 $   *
  + * Version: $Revision: 1.21 $   *
***/
   
   /*
  @@ -565,9 +565,9 @@
   
   static const char *jk_mount_context(cmd_parms *cmd, 
   void *dummy, 
  -char *context,
  -char *worker,
  -char *maybe_cookie)
  +const char *context,
  +const char *worker,
  +const char *maybe_cookie)
   {
   server_rec *s = cmd-server;
   jk_server_conf_t *conf =
  @@ -591,8 +591,8 @@
   
   static const char *jk_automount_context(cmd_parms *cmd,
   void *dummy,
  -char *worker,
  -char *virtualhost)
  +const char *worker,
  +const char *virtualhost)
   {
   server_rec *s = cmd-server;
   jk_server_conf_t *conf =
  @@ -614,7 +614,7 @@
   
   static const char *jk_set_worker_file(cmd_parms *cmd, 
 void *dummy, 
  -  char *worker_file)
  +  const char *worker_file)
   {
   server_rec *s = cmd-server;
   struct stat statbuf;
  @@ -642,7 +642,7 @@
   
   static const char *jk_set_log_file(cmd_parms *cmd, 
  void *dummy, 
  -   char *log_file)
  +   const char *log_file)
   {
   server_rec *s = cmd-server;
   jk_server_conf_t *conf =
  @@ -665,7 +665,7 @@
   
   static const char *jk_set_log_level(cmd_parms *cmd, 
   void *dummy, 
  -char *log_level)
  +const char *log_level)
   {
   server_rec *s = cmd-server;
   jk_server_conf_t *conf =
  @@ -684,7 +684,7 @@
   
   static const char * jk_set_log_fmt(cmd_parms *cmd,
 void *dummy,
  -  char * log_format)
  +  const char * log_format)
   {
   jk_set_log_format(log_format);
   return NULL;
  @@ -718,13 +718,13 @@
   
   static const char *jk_set_https_indicator(cmd_parms *cmd,
 void *dummy,
  -  char *indicator)
  +  const char *indicator)
   {
   server_rec *s = cmd-server;
   jk_server_conf_t *conf =
   (jk_server_conf_t *)ap_get_module_config(s-module_config, jk_module);
   
  -conf-https_indicator = indicator;
  +conf-https_indicator = ap_pstrdup(cmd-pool,indicator);
   
   return NULL;
   }
  @@ -737,13 +737,13 @@
   
   static const char *jk_set_certs_indicator(cmd_parms *cmd,
 void *dummy,
  -  char *indicator)
  +  const char *indicator)
   {
   server_rec *s = cmd-server;
   jk_server_conf_t *conf =
   (jk_server_conf_t *)ap_get_module_config(s-module_config, jk_module);
   
  -conf-certs_indicator = indicator;
  +conf-certs_indicator = ap_pstrdup(cmd-pool,indicator);
   
   return NULL;
   }
  @@ -756,13 +756,13 @@
   
   static const char *jk_set_cipher_indicator(cmd_parms *cmd,
  void *dummy,
  -   char *indicator)
  +   const char *indicator)
   {
   server_rec *s = cmd-server;
   jk_server_conf_t *conf 

Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h

2001-09-05 Thread jean-frederic clere

Hi,

I would like to comment the following:

Some of the const are causing a lot of warnings, I have stopped fixed because
I was afraid to have to change too much things... (I have put /* DIRTY */ where
I have stopped forwarding the const).

Any comment?

Cheers

Jean-frederic

[EMAIL PROTECTED] wrote:
 
 jfclere 01/09/05 10:05:24
 
   Modified:jk/native/apache-2.0 mod_jk.c
jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h
   Log:
   Get ride of some warnings - But there is still a lot to do with const -
   I have put /* DIRTY */ where the cast looks weird.
 
   Revision  ChangesPath
   1.21  +65 -51jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
 
   Index: mod_jk.c
   ===
   RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
   retrieving revision 1.20
   retrieving revision 1.21
   diff -u -r1.20 -r1.21
   --- mod_jk.c  2001/09/05 14:43:48 1.20
   +++ mod_jk.c  2001/09/05 17:05:23 1.21
   @@ -60,7 +60,7 @@
 * Description: Apache 2 plugin for Jakarta/Tomcat *
 * Author:  Gal Shachor [EMAIL PROTECTED]   *
 * Henri Gomez [EMAIL PROTECTED]   *
   - * Version: $Revision: 1.20 $   *
   + * Version: $Revision: 1.21 $   *
 ***/
 
/*
   @@ -565,9 +565,9 @@
 
static const char *jk_mount_context(cmd_parms *cmd,
void *dummy,
   -char *context,
   -char *worker,
   -char *maybe_cookie)
   +const char *context,
   +const char *worker,
   +const char *maybe_cookie)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
   @@ -591,8 +591,8 @@
 
static const char *jk_automount_context(cmd_parms *cmd,
void *dummy,
   -char *worker,
   -char *virtualhost)
   +const char *worker,
   +const char *virtualhost)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
   @@ -614,7 +614,7 @@
 
static const char *jk_set_worker_file(cmd_parms *cmd,
  void *dummy,
   -  char *worker_file)
   +  const char *worker_file)
{
server_rec *s = cmd-server;
struct stat statbuf;
   @@ -642,7 +642,7 @@
 
static const char *jk_set_log_file(cmd_parms *cmd,
   void *dummy,
   -   char *log_file)
   +   const char *log_file)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
   @@ -665,7 +665,7 @@
 
static const char *jk_set_log_level(cmd_parms *cmd,
void *dummy,
   -char *log_level)
   +const char *log_level)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
   @@ -684,7 +684,7 @@
 
static const char * jk_set_log_fmt(cmd_parms *cmd,
  void *dummy,
   -  char * log_format)
   +  const char * log_format)
{
jk_set_log_format(log_format);
return NULL;
   @@ -718,13 +718,13 @@
 
static const char *jk_set_https_indicator(cmd_parms *cmd,
  void *dummy,
   -  char *indicator)
   +  const char *indicator)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s-module_config, jk_module);
 
   -conf-https_indicator = indicator;
   +conf-https_indicator = ap_pstrdup(cmd-pool,indicator);
 
return NULL;
}
   @@ -737,13 +737,13 @@
 
static const char *jk_set_certs_indicator(cmd_parms *cmd,
  void *dummy,
   -  char *indicator)
   +  const char *indicator)
{
server_rec *s = cmd-server;
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s-module_config, jk_module);
 
   -conf-certs_indicator = indicator;
   +conf-certs_indicator = ap_pstrdup(cmd-pool,indicator);
 
   

Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h jk_util.c jk_util.h

2001-09-05 Thread cmanolache

On Wed, 5 Sep 2001, jean-frederic clere wrote:

 Hi,

 I would like to comment the following:

 Some of the const are causing a lot of warnings, I have stopped fixed because
 I was afraid to have to change too much things... (I have put /* DIRTY */ where
 I have stopped forwarding the const).

 Any comment?

IMHO you should go ahead and finish it, we all love cleaner code.

Costin