costin 02/04/12 16:08:45
Modified: jk/native2/common jk_config.c
Log:
Few methods made public, fix a problem in replaceProperties.
( the public methods will be 'inherited' in config_registry ).
Also use the virtual methods - so overriding can work.
I love OO programming :-)
Revision Changes Path
1.11 +12 -10 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_config.c 12 Apr 2002 21:49:03 -0000 1.10
+++ jk_config.c 12 Apr 2002 23:08:45 -0000 1.11
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: General purpose config object *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.10 $ *
+ * Version: $Revision: 1.11 $ *
***************************************************************************/
#include "jk_global.h"
@@ -239,8 +239,8 @@
@param name the property to be set ( can't have '.' or ':' in it )
@param val the value, $(property) will be replaced.
*/
-static int jk2_config_setProperty(jk_env_t *env, jk_config_t *cfg,
- jk_bean_t *mbean, char *name, void *val)
+int jk2_config_setProperty(jk_env_t *env, jk_config_t *cfg,
+ jk_bean_t *mbean, char *name, void *val)
{
char *pname;
if( mbean == cfg->mbean ) {
@@ -283,7 +283,7 @@
return JK_FALSE;
}
-static int jk2_config_setPropertyString(jk_env_t *env, jk_config_t *cfg,
+int jk2_config_setPropertyString(jk_env_t *env, jk_config_t *cfg,
char *name, char *value)
{
jk_bean_t *mbean;
@@ -299,7 +299,7 @@
status=jk2_config_processBeanPropertyString(env, cfg, name, &objName, &propName
);
if( status!=JK_TRUE ) {
/* Unknown properties ends up in our config, as 'unclaimed' or global */
- jk2_config_setProperty( env, cfg, cfg->mbean, name, value );
+ cfg->setProperty( env, cfg, cfg->mbean, name, value );
return status;
}
@@ -310,18 +310,18 @@
if( mbean == NULL ) {
/* Can't create it, save the value in our map */
- jk2_config_setProperty( env, cfg, cfg->mbean, name, value );
+ cfg->setProperty( env, cfg, cfg->mbean, name, value );
return JK_FALSE;
}
if( mbean->settings == NULL )
jk2_map_default_create(env, &mbean->settings, cfg->pool);
- return jk2_config_setProperty( env, cfg, mbean, propName, value );
+ return cfg->setProperty( env, cfg, mbean, propName, value );
}
-static char *jk2_config_getString(jk_env_t *env, jk_config_t *conf,
+char *jk2_config_getString(jk_env_t *env, jk_config_t *conf,
const char *name, char *def)
{
char *val= conf->map->get( env, conf->map, name );
@@ -330,7 +330,7 @@
return val;
}
-static int jk2_config_getBool(jk_env_t *env, jk_config_t *conf,
+int jk2_config_getBool(jk_env_t *env, jk_config_t *conf,
const char *prop, const char *def)
{
char *val=jk2_config_getString( env, conf, prop, (char *)def );
@@ -739,7 +739,7 @@
if(env_value != NULL ) {
int offset=0;
- char *new_value = resultPool->alloc(env, resultPool,
+ char *new_value = resultPool->calloc(env, resultPool,
(strlen(rc) +
strlen(env_value)));
if(!new_value) {
break;
@@ -749,6 +749,8 @@
} else {
strncpy(new_value, rc, env_start-rc);
}
+ /* fprintf(stderr, "XXX %s %s %s\n", new_value, env_value, env_end
+ 1 ); */
+
strcat(new_value, env_value);
strcat(new_value, env_end + 1);
offset= env_start - rc + strlen( env_value );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
