mturk 2004/11/09 04:17:44
Modified: jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
jk/native/common jk_map.c jk_map.h jk_uri_worker_map.c
jk_util.c jk_worker.c
jk/native/domino jk_dsapi_plugin.c
jk/native/iis jk_isapi_plugin.c
jk/native/isapi jk_isapi_plugin.c
jk/native/netscape jk_nsapi_plugin.c
Log:
Prefix all map_xxx public functions with jk_.
Revision Changes Path
1.50 +15 -15 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mod_jk.c 5 Nov 2004 15:28:39 -0000 1.49
+++ mod_jk.c 9 Nov 2004 12:17:42 -0000 1.50
@@ -678,7 +678,7 @@
/*
* Add the new worker to the alias map.
*/
- map_put(conf->uri_to_context, context, worker, (void **)&old);
+ jk_map_put(conf->uri_to_context, context, worker, (void **)&old);
return NULL;
}
@@ -701,7 +701,7 @@
* Add the new automount to the auto map.
*/
char *old;
- map_put(conf->automount, worker, virtualhost, (void **)&old);
+ jk_map_put(conf->automount, worker, virtualhost, (void **)&old);
return NULL;
}
@@ -1605,7 +1605,7 @@
(jk_server_conf_t *) ap_pcalloc(p, sizeof(jk_server_conf_t));
c->worker_properties = NULL;
- map_alloc(&c->worker_properties);
+ jk_map_alloc(&c->worker_properties);
c->worker_file = NULL;
c->log_file = NULL;
c->log_level = -1;
@@ -1646,10 +1646,10 @@
c->session_indicator = "SSL_SESSION_ID";
c->key_size_indicator = "SSL_CIPHER_USEKEYSIZE";
- if (!map_alloc(&(c->uri_to_context))) {
+ if (!jk_map_alloc(&(c->uri_to_context))) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
}
- if (!map_alloc(&(c->automount))) {
+ if (!jk_map_alloc(&(c->automount))) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
}
c->uw_map = NULL;
@@ -1667,15 +1667,15 @@
static void copy_jk_map(ap_pool * p, server_rec * s, jk_map_t *src,
jk_map_t *dst)
{
- int sz = map_size(src);
+ int sz = jk_map_size(src);
int i;
for (i = 0; i < sz; i++) {
void *old;
- char *name = map_name_at(src, i);
- if (map_get(src, name, NULL) == NULL) {
- if (!map_put
- (dst, name, ap_pstrdup(p, map_get_string(src, name, NULL)),
- &old)) {
+ char *name = jk_map_name_at(src, i);
+ if (jk_map_get(src, name, NULL) == NULL) {
+ if (!jk_map_put (dst, name,
+ ap_pstrdup(p, jk_map_get_string(src, name, NULL)),
+ &old)) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
}
}
@@ -1757,9 +1757,9 @@
/*
{ int i;
jk_log(conf->log, JK_LOG_DEBUG, "default secret key = %s\n",
conf->secret_key);
-for (i = 0; i < map_size(conf->automount); i++)
+for (i = 0; i < jk_map_size(conf->automount); i++)
{
- char *name = map_name_at(conf->automount, i);
+ char *name = jk_map_name_at(conf->automount, i);
jk_log(conf->log, JK_LOG_DEBUG, "worker = %s and
virtualhost = %s\n", name, map_get_string(conf->automount, name, NULL));
}
}
@@ -1773,7 +1773,7 @@
/*if(map_alloc(&init_map)) { */
- if (map_read_properties(init_map, conf->worker_file)) {
+ if (jk_map_read_properties(init_map, conf->worker_file)) {
#if MODULE_MAGIC_NUMBER >= 19980527
/* Tell apache we're here */
1.98 +17 -17 jakarta-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.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- mod_jk.c 5 Nov 2004 15:28:39 -0000 1.97
+++ mod_jk.c 9 Nov 2004 12:17:43 -0000 1.98
@@ -716,7 +716,7 @@
/*
* Add the new worker to the alias map.
*/
- map_put(conf->uri_to_context, context, worker, (void **)&old);
+ jk_map_put(conf->uri_to_context, context, worker, (void **)&old);
return NULL;
}
@@ -741,7 +741,7 @@
* Add the new automount to the auto map.
*/
char *old;
- map_put(conf->automount, worker, virtualhost, (void **)&old);
+ jk_map_put(conf->automount, worker, virtualhost, (void **)&old);
return NULL;
}
@@ -790,9 +790,9 @@
jk_map_t *m = conf->worker_properties;
- value = map_replace_properties(value, m);
+ value = jk_map_replace_properties(value, m);
- oldv = map_get_string(m, name, NULL);
+ oldv = jk_map_get_string(m, name, NULL);
if (oldv) {
char *tmpv = apr_palloc(cmd->pool,
@@ -816,7 +816,7 @@
if (value) {
void *old = NULL;
- map_put(m, name, value, &old);
+ jk_map_put(m, name, value, &old);
/*printf("Setting %s %s\n", name, value); */
}
return NULL;
@@ -1866,7 +1866,7 @@
(jk_server_conf_t *) apr_pcalloc(p, sizeof(jk_server_conf_t));
c->worker_properties = NULL;
- map_alloc(&c->worker_properties);
+ jk_map_alloc(&c->worker_properties);
c->worker_file = NULL;
c->log_file = NULL;
c->log_level = -1;
@@ -1907,10 +1907,10 @@
c->session_indicator = "SSL_SESSION_ID";
c->key_size_indicator = "SSL_CIPHER_USEKEYSIZE";
- if (!map_alloc(&(c->uri_to_context))) {
+ if (!jk_map_alloc(&(c->uri_to_context))) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
}
- if (!map_alloc(&(c->automount))) {
+ if (!jk_map_alloc(&(c->automount))) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
}
@@ -1932,15 +1932,15 @@
static void copy_jk_map(apr_pool_t * p, server_rec * s, jk_map_t *src,
jk_map_t *dst)
{
- int sz = map_size(src);
+ int sz = jk_map_size(src);
int i;
for (i = 0; i < sz; i++) {
void *old;
- char *name = map_name_at(src, i);
- if (map_get(src, name, NULL) == NULL) {
- if (!map_put(dst, name,
- apr_pstrdup(p, map_get_string(src, name, NULL)),
- &old)) {
+ char *name = jk_map_name_at(src, i);
+ if (jk_map_get(src, name, NULL) == NULL) {
+ if (!jk_map_put(dst, name,
+ apr_pstrdup(p, jk_map_get_string(src, name,
NULL)),
+ &old)) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
}
}
@@ -2142,8 +2142,8 @@
}
/* if(map_alloc(&init_map)) { */
- if (!map_read_properties(init_map, conf->worker_file)) {
- if (map_size(init_map) == 0) {
+ if (!jk_map_read_properties(init_map, conf->worker_file)) {
+ if (jk_map_size(init_map) == 0) {
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO,
APLOG_EMERG, NULL,
"No worker file and no worker options in httpd.conf
\n"
1.17 +30 -30 jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_map.c 8 Nov 2004 13:45:06 -0000 1.16
+++ jk_map.c 9 Nov 2004 12:17:43 -0000 1.17
@@ -49,21 +49,21 @@
static size_t trim(char *s);
static int map_realloc(jk_map_t *m);
-int map_alloc(jk_map_t **m)
+int jk_map_alloc(jk_map_t **m)
{
if (m) {
- return map_open(*m = (jk_map_t *)malloc(sizeof(jk_map_t)));
+ return jk_map_open(*m = (jk_map_t *)malloc(sizeof(jk_map_t)));
}
return JK_FALSE;
}
-int map_free(jk_map_t **m)
+int jk_map_free(jk_map_t **m)
{
int rc = JK_FALSE;
if (m && *m) {
- map_close(*m);
+ jk_map_close(*m);
free(*m);
*m = NULL;
}
@@ -71,7 +71,7 @@
return rc;
}
-int map_open(jk_map_t *m)
+int jk_map_open(jk_map_t *m)
{
int rc = JK_FALSE;
@@ -87,7 +87,7 @@
return rc;
}
-int map_close(jk_map_t *m)
+int jk_map_close(jk_map_t *m)
{
int rc = JK_FALSE;
@@ -99,7 +99,7 @@
return rc;
}
-void *map_get(jk_map_t *m, const char *name, const void *def)
+void *jk_map_get(jk_map_t *m, const char *name, const void *def)
{
const void *rc = (void *)def;
@@ -116,7 +116,7 @@
return (void *)rc; /* DIRTY */
}
-int map_get_int(jk_map_t *m, const char *name, int def)
+int jk_map_get_int(jk_map_t *m, const char *name, int def)
{
char buf[100];
char *rc;
@@ -125,7 +125,7 @@
int multit = 1;
sprintf(buf, "%d", def);
- rc = map_get_string(m, name, buf);
+ rc = jk_map_get_string(m, name, buf);
len = strlen(rc);
if (len) {
@@ -145,27 +145,27 @@
return int_res * multit;
}
-double map_get_double(jk_map_t *m, const char *name, double def)
+double jk_map_get_double(jk_map_t *m, const char *name, double def)
{
char buf[100];
char *rc;
sprintf(buf, "%f", def);
- rc = map_get_string(m, name, buf);
+ rc = jk_map_get_string(m, name, buf);
return atof(rc);
}
-char *map_get_string(jk_map_t *m, const char *name, const char *def)
+char *jk_map_get_string(jk_map_t *m, const char *name, const char *def)
{
- return map_get(m, name, def);
+ return jk_map_get(m, name, def);
}
-char **map_get_string_list(jk_map_t *m,
- const char *name,
- unsigned *list_len, const char *def)
+char **jk_map_get_string_list(jk_map_t *m,
+ const char *name,
+ unsigned *list_len, const char *def)
{
- char *l = map_get_string(m, name, def);
+ char *l = jk_map_get_string(m, name, def);
char **ar = NULL;
#if defined(AS400) || defined(_REENTRANT)
char *lasts;
@@ -214,7 +214,7 @@
return ar;
}
-int map_put(jk_map_t *m, const char *name, const void *value, void **old)
+int jk_map_put(jk_map_t *m, const char *name, const void *value, void **old)
{
int rc = JK_FALSE;
@@ -246,7 +246,7 @@
return rc;
}
-int map_read_property(jk_map_t *m, const char *str)
+int jk_map_read_property(jk_map_t *m, const char *str)
{
int rc = JK_TRUE;
char buf[LENGTH_OF_LINE + 1];
@@ -262,8 +262,8 @@
*v = '\0';
v++;
if (strlen(v) && strlen(prp)) {
- char *oldv = map_get_string(m, prp, NULL);
- v = map_replace_properties(v, m);
+ char *oldv = jk_map_get_string(m, prp, NULL);
+ v = jk_map_replace_properties(v, m);
if (oldv) {
char *tmpv = jk_pool_alloc(&m->p,
strlen(v) +
@@ -286,7 +286,7 @@
}
if (v) {
void *old = NULL;
- map_put(m, prp, v, &old);
+ jk_map_put(m, prp, v, &old);
}
else {
rc = JK_FALSE;
@@ -298,7 +298,7 @@
}
-int map_read_properties(jk_map_t *m, const char *f)
+int jk_map_read_properties(jk_map_t *m, const char *f)
{
int rc = JK_FALSE;
@@ -317,7 +317,7 @@
while (NULL != (prp = fgets(buf, LENGTH_OF_LINE, fp))) {
trim_prp_comment(prp);
- if ((rc = map_read_property(m, prp)) == JK_FALSE)
+ if ((rc =jk_map_read_property(m, prp)) == JK_FALSE)
break;
}
fclose(fp);
@@ -328,7 +328,7 @@
}
-int map_size(jk_map_t *m)
+int jk_map_size(jk_map_t *m)
{
if (m) {
return m->size;
@@ -337,7 +337,7 @@
return -1;
}
-char *map_name_at(jk_map_t *m, int idex)
+char *jk_map_name_at(jk_map_t *m, int idex)
{
if (m && idex >= 0) {
return (char *)m->names[idex]; /* DIRTY */
@@ -346,7 +346,7 @@
return NULL;
}
-void *map_value_at(jk_map_t *m, int idex)
+void *jk_map_value_at(jk_map_t *m, int idex)
{
if (m && idex >= 0) {
return (void *)m->values[idex]; /* DIRTY */
@@ -418,7 +418,7 @@
* Replace $(property) in value.
*
*/
-char *map_replace_properties(const char *value, jk_map_t *m)
+char *jk_map_replace_properties(const char *value, jk_map_t *m)
{
char *rc = (char *)value;
char *env_start = rc;
@@ -438,7 +438,7 @@
strcpy(env_name, env_start + 2);
*env_end = ')';
- env_value = map_get_string(m, env_name, NULL);
+ env_value = jk_map_get_string(m, env_name, NULL);
if (!env_value) {
env_value = getenv(env_name);
}
1.12 +17 -17 jakarta-tomcat-connectors/jk/native/common/jk_map.h
Index: jk_map.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_map.h 8 Nov 2004 13:31:05 -0000 1.11
+++ jk_map.h 9 Nov 2004 12:17:43 -0000 1.12
@@ -33,43 +33,43 @@
struct jk_map;
typedef struct jk_map jk_map_t;
-int map_alloc(jk_map_t **m);
+int jk_map_alloc(jk_map_t **m);
-int map_free(jk_map_t **m);
+int jk_map_free(jk_map_t **m);
-int map_open(jk_map_t *m);
+int jk_map_open(jk_map_t *m);
-int map_close(jk_map_t *m);
+int jk_map_close(jk_map_t *m);
-void *map_get(jk_map_t *m, const char *name, const void *def);
+void *jk_map_get(jk_map_t *m, const char *name, const void *def);
-int map_get_int(jk_map_t *m, const char *name, int def);
+int jk_map_get_int(jk_map_t *m, const char *name, int def);
-double map_get_double(jk_map_t *m, const char *name, double def);
+double jk_map_get_double(jk_map_t *m, const char *name, double def);
-char *map_get_string(jk_map_t *m, const char *name, const char *def);
+char *jk_map_get_string(jk_map_t *m, const char *name, const char *def);
-char **map_get_string_list(jk_map_t *m,
+char **jk_map_get_string_list(jk_map_t *m,
const char *name,
unsigned *list_len, const char *def);
-int map_put(jk_map_t *m, const char *name, const void *value, void **old);
+int jk_map_put(jk_map_t *m, const char *name, const void *value, void **old);
-int map_read_property(jk_map_t *m, const char *str);
+int jk_map_read_property(jk_map_t *m, const char *str);
-int map_read_properties(jk_map_t *m, const char *f);
+int jk_map_read_properties(jk_map_t *m, const char *f);
-int map_size(jk_map_t *m);
+int jk_map_size(jk_map_t *m);
-char *map_name_at(jk_map_t *m, int idex);
+char *jk_map_name_at(jk_map_t *m, int idex);
-void *map_value_at(jk_map_t *m, int idex);
+void *jk_map_value_at(jk_map_t *m, int idex);
/**
* Replace $(property) in value.
*
*/
-char *map_replace_properties(const char *value, jk_map_t *m);
+char *jk_map_replace_properties(const char *value, jk_map_t *m);
#ifdef __cplusplus
1.24 +4 -4
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
Index: jk_uri_worker_map.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_uri_worker_map.c 8 Oct 2004 07:50:40 -0000 1.23
+++ jk_uri_worker_map.c 9 Nov 2004 12:17:43 -0000 1.24
@@ -364,7 +364,7 @@
uw_map->size = 0;
uw_map->maps = NULL;
- sz = map_size(init_data);
+ sz = jk_map_size(init_data);
jk_log(l, JK_LOG_DEBUG,
"jk_uri_worker_map_t::uri_worker_map_open, rule map size is
%d\n",
@@ -374,8 +374,8 @@
int i;
for (i = 0; i < sz; i++) {
if (uri_worker_map_add
- (uw_map, map_name_at(init_data, i),
- map_value_at(init_data, i), l) == JK_FALSE) {
+ (uw_map, jk_map_name_at(init_data, i),
+ jk_map_value_at(init_data, i), l) == JK_FALSE) {
rc = JK_FALSE;
break;
}
1.33 +34 -34 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_util.c 8 Nov 2004 13:48:11 -0000 1.32
+++ jk_util.c 9 Nov 2004 12:17:43 -0000 1.33
@@ -292,7 +292,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, TYPE_OF_WORKER);
- return map_get_string(m, buf, DEFAULT_WORKER_TYPE);
+ return jk_map_get_string(m, buf, DEFAULT_WORKER_TYPE);
}
char *jk_get_worker_secret(jk_map_t *m, const char *wname)
@@ -306,7 +306,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, SECRET_OF_WORKER);
- secret = map_get_string(m, buf, NULL);
+ secret = jk_map_get_string(m, buf, NULL);
return secret;
}
@@ -322,7 +322,7 @@
if (m && prop && wname && pname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, pname);
- *prop = map_get_string(m, buf, NULL);
+ *prop = jk_map_get_string(m, buf, NULL);
if (*prop) {
return JK_TRUE;
}
@@ -338,7 +338,7 @@
if (m && prop && wname && pname) {
int i;
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, pname);
- i = map_get_int(m, buf, -1);
+ i = jk_map_get_int(m, buf, -1);
if (-1 != i) {
*prop = i;
return JK_TRUE;
@@ -357,7 +357,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, HOST_OF_WORKER);
- return map_get_string(m, buf, def);
+ return jk_map_get_string(m, buf, def);
}
int jk_get_worker_port(jk_map_t *m, const char *wname, int def)
@@ -370,7 +370,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, PORT_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_cache_size(jk_map_t *m, const char *wname, int def)
@@ -383,7 +383,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, CACHE_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_socket_timeout(jk_map_t *m, const char *wname, int def)
@@ -397,7 +397,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
SOCKET_TIMEOUT_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_socket_keepalive(jk_map_t *m, const char *wname, int def)
@@ -411,7 +411,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
SOCKET_KEEPALIVE_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_cache_timeout(jk_map_t *m, const char *wname, int def)
@@ -425,7 +425,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
CACHE_TIMEOUT_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_connect_timeout(jk_map_t *m, const char *wname, int def)
@@ -439,7 +439,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
CONNECT_TIMEOUT_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_prepost_timeout(jk_map_t *m, const char *wname, int def)
@@ -453,7 +453,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
PREPOST_TIMEOUT_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_reply_timeout(jk_map_t *m, const char *wname, int def)
@@ -467,7 +467,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
REPLY_TIMEOUT_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_recycle_timeout(jk_map_t *m, const char *wname, int def)
@@ -481,7 +481,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
RECYCLE_TIMEOUT_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
int jk_get_worker_recovery_opts(jk_map_t *m, const char *wname, int def)
@@ -495,7 +495,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
RECOVERY_OPTS_OF_WORKER);
- return map_get_int(m, buf, def);
+ return jk_map_get_int(m, buf, def);
}
char *jk_get_worker_secret_key(jk_map_t *m, const char *wname)
@@ -507,13 +507,13 @@
}
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, SECRET_KEY_OF_WORKER);
- return map_get_string(m, buf, NULL);
+ return jk_map_get_string(m, buf, NULL);
}
int jk_get_worker_list(jk_map_t *m, char ***list, unsigned *num_of_wokers)
{
if (m && list && num_of_wokers) {
- char **ar = map_get_string_list(m,
+ char **ar = jk_map_get_string_list(m,
WORKER_LIST_PROPERTY_NAME,
num_of_wokers,
DEFAULT_WORKER);
@@ -543,7 +543,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, LOAD_FACTOR_OF_WORKER);
- return map_get_int(m, buf, DEFAULT_LB_FACTOR);
+ return jk_map_get_int(m, buf, DEFAULT_LB_FACTOR);
}
int jk_get_is_sticky_session(jk_map_t *m, const char *wname)
@@ -553,7 +553,7 @@
if (m && wname) {
int value;
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, STICKY_SESSION);
- value = map_get_int(m, buf, 1);
+ value = jk_map_get_int(m, buf, 1);
if (!value)
rc = JK_FALSE;
}
@@ -567,7 +567,7 @@
if (m && wname) {
int value;
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, LOCAL_WORKER_FLAG);
- value = map_get_int(m, buf, 0);
+ value = jk_map_get_int(m, buf, 0);
if (value)
rc = JK_TRUE;
}
@@ -582,7 +582,7 @@
int value;
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, lb_wname,
LOCAL_WORKER_ONLY_FLAG);
- value = map_get_int(m, buf, 0);
+ value = jk_map_get_int(m, buf, 0);
if (value)
rc = JK_TRUE;
}
@@ -600,7 +600,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, lb_wname,
BALANCED_WORKERS);
- ar = map_get_string_list(m, buf, num_of_wokers, NULL);
+ ar = jk_map_get_string_list(m, buf, num_of_wokers, NULL);
if (ar) {
*list = ar;
return JK_TRUE;
@@ -620,7 +620,7 @@
int i;
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, MX_OF_WORKER);
- i = map_get_int(m, buf, -1);
+ i = jk_map_get_int(m, buf, -1);
if (-1 != i) {
*mx = (unsigned)i;
return JK_TRUE;
@@ -638,7 +638,7 @@
int i;
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, MS_OF_WORKER);
- i = map_get_int(m, buf, -1);
+ i = jk_map_get_int(m, buf, -1);
if (-1 != i) {
*ms = (unsigned)i;
return JK_TRUE;
@@ -655,7 +655,7 @@
if (m && cp && wname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, CP_OF_WORKER);
- *cp = map_get_string(m, buf, NULL);
+ *cp = jk_map_get_string(m, buf, NULL);
if (*cp) {
return JK_TRUE;
}
@@ -672,7 +672,7 @@
if (m && bt && wname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, BRIDGE_OF_WORKER);
- type = map_get_string(m, buf, NULL);
+ type = jk_map_get_string(m, buf, NULL);
if (type) {
if (!strcasecmp(type, TOMCAT32_BRIDGE_NAME))
@@ -700,7 +700,7 @@
if (m && vm_path && wname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, JVM_OF_WORKER);
- *vm_path = map_get_string(m, buf, NULL);
+ *vm_path = jk_map_get_string(m, buf, NULL);
if (*vm_path) {
return JK_TRUE;
}
@@ -718,7 +718,7 @@
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
NATIVE_LIB_OF_WORKER);
- *cb_path = map_get_string(m, buf, NULL);
+ *cb_path = jk_map_get_string(m, buf, NULL);
if (*cb_path) {
return JK_TRUE;
}
@@ -734,7 +734,7 @@
if (m && cmd_line && wname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
CMD_LINE_OF_WORKER);
- *cmd_line = map_get_string(m, buf, NULL);
+ *cmd_line = jk_map_get_string(m, buf, NULL);
if (*cmd_line) {
return JK_TRUE;
}
@@ -792,7 +792,7 @@
if (m && stdout_name && wname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, STDOUT_OF_WORKER);
- *stdout_name = map_get_string(m, buf, NULL);
+ *stdout_name = jk_map_get_string(m, buf, NULL);
if (*stdout_name) {
return JK_TRUE;
}
@@ -808,7 +808,7 @@
if (m && stderr_name && wname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, STDERR_OF_WORKER);
- *stderr_name = map_get_string(m, buf, NULL);
+ *stderr_name = jk_map_get_string(m, buf, NULL);
if (*stderr_name) {
return JK_TRUE;
}
@@ -824,7 +824,7 @@
if (m && sysprops && wname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname,
SYSPROPS_OF_WORKER);
- *sysprops = map_get_string(m, buf, NULL);
+ *sysprops = jk_map_get_string(m, buf, NULL);
if (*sysprops) {
return JK_TRUE;
}
@@ -840,7 +840,7 @@
if (m && libpath && wname) {
sprintf(buf, "%s.%s.%s", PREFIX_OF_WORKER, wname, LIBPATH_OF_WORKER);
- *libpath = map_get_string(m, buf, NULL);
+ *libpath = jk_map_get_string(m, buf, NULL);
if (*libpath) {
return JK_TRUE;
}
1.19 +8 -8 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_worker.c 8 Nov 2004 13:48:56 -0000 1.18
+++ jk_worker.c 9 Nov 2004 12:17:43 -0000 1.19
@@ -42,7 +42,7 @@
jk_log(l, JK_LOG_DEBUG, "Into wc_open\n");
- if (!map_alloc(&worker_map)) {
+ if (!jk_map_alloc(&worker_map)) {
return JK_FALSE;
}
@@ -79,7 +79,7 @@
jk_log(l, JK_LOG_DEBUG, "Into wc_get_worker_for_name %s\n", name);
- rc = map_get(worker_map, name, NULL);
+ rc = jk_map_get(worker_map, name, NULL);
jk_log(l, JK_LOG_DEBUG, "wc_get_worker_for_name, done %s a worker\n",
rc ? "found" : "did not find");
@@ -144,23 +144,23 @@
static void close_workers(jk_logger_t *l)
{
- int sz = map_size(worker_map);
+ int sz = jk_map_size(worker_map);
jk_log(l, JK_LOG_DEBUG, "close_workers got %d workers to destroy\n", sz);
if (sz > 0) {
int i;
for (i = 0; i < sz; i++) {
- jk_worker_t *w = map_value_at(worker_map, i);
+ jk_worker_t *w = jk_map_value_at(worker_map, i);
if (w) {
jk_log(l, JK_LOG_DEBUG,
"close_workers will destroy worker %s\n",
- map_name_at(worker_map, i));
+ jk_map_name_at(worker_map, i));
w->destroy(&w, l);
}
}
}
- map_free(&worker_map);
+ jk_map_free(&worker_map);
}
static int build_worker_map(jk_map_t *init_data,
@@ -181,7 +181,7 @@
if (wc_create_worker(worker_list[i], init_data, &w, we, l)) {
jk_worker_t *oldw = NULL;
- if (!map_put(worker_map, worker_list[i], w, (void *)&oldw)) {
+ if (!jk_map_put(worker_map, worker_list[i], w, (void *)&oldw)) {
w->destroy(&w, l);
return JK_FALSE;
}
1.16 +5 -5
jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c
Index: jk_dsapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_dsapi_plugin.c 5 Nov 2004 15:28:39 -0000 1.15
+++ jk_dsapi_plugin.c 9 Nov 2004 12:17:44 -0000 1.16
@@ -961,8 +961,8 @@
DEBUG(("Initialising worker map\n"));
- if (map_alloc(&map)) {
- if (map_read_properties(map, workerMountFile))
+ if (jk_map_alloc(&map)) {
+ if (jk_map_read_properties(map, workerMountFile))
if (uri_worker_map_alloc(&uw_map, map, logger))
ok = JK_TRUE;
jk_map_free(&map);
@@ -973,9 +973,9 @@
if (ok) {
ok = JK_FALSE;
DEBUG(("About to allocate map\n"));
- if (map_alloc(&map)) {
+ if (jk_map_alloc(&map)) {
DEBUG(("About to read %s\n", workerFile));
- if (map_read_properties(map, workerFile)) {
+ if (jk_map_read_properties(map, workerFile)) {
#if defined(JK_VERSION) && JK_VERSION >= MAKEVERSION(1, 2, 0, 1)
char server[256];
1.27 +18 -18 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_isapi_plugin.c 5 Nov 2004 15:28:39 -0000 1.26
+++ jk_isapi_plugin.c 9 Nov 2004 12:17:44 -0000 1.27
@@ -1006,24 +1006,24 @@
worker_mount_file);
jk_log(logger, JK_LOG_DEBUG, "Using uri select %d.\n",
uri_select_option);
- if (map_alloc(&map)) {
- if (map_read_properties(map, worker_mount_file)) {
+ if (jk_map_alloc(&map)) {
+ if (jk_map_read_properties(map, worker_mount_file)) {
/* remove non-mapping entries (assume they were string
substitutions) */
jk_map_t *map2;
- if (map_alloc(&map2)) {
+ if (jk_map_alloc(&map2)) {
int sz, i;
void *old;
- sz = map_size(map);
+ sz = jk_map_size(map);
for (i = 0; i < sz; i++) {
- char *name = map_name_at(map, i);
+ char *name = jk_map_name_at(map, i);
if ('/' == *name) {
- map_put(map2, name, map_value_at(map, i), &old);
+ jk_map_put(map2, name, jk_map_value_at(map, i),
&old);
}
else {
jk_log(logger, JK_LOG_DEBUG,
"Ignoring worker mount file entry %s=%s.\n",
- name, map_value_at(map, i));
+ name, jk_map_value_at(map, i));
}
}
@@ -1044,8 +1044,8 @@
if (rc) {
rc = JK_FALSE;
- if (map_alloc(&map)) {
- if (map_read_properties(map, worker_file)) {
+ if (jk_map_alloc(&map)) {
+ if (jk_map_read_properties(map, worker_file)) {
/* we add the URI->WORKER MAP since workers using AJP14 will
feed it */
worker_env.uri_to_worker = uw_map;
@@ -1101,48 +1101,48 @@
char *tmp;
jk_map_t *map;
- if (map_alloc(&map)) {
- if (map_read_properties(map, ini_file_name)) {
+ if (jk_map_alloc(&map)) {
+ if (jk_map_read_properties(map, ini_file_name)) {
using_ini_file = JK_TRUE;
}
}
if (using_ini_file) {
- tmp = map_get_string(map, JK_LOG_FILE_TAG, NULL);
+ tmp = jk_map_get_string(map, JK_LOG_FILE_TAG, NULL);
if (tmp) {
strcpy(log_file, tmp);
}
else {
ok = JK_FALSE;
}
- tmp = map_get_string(map, JK_LOG_LEVEL_TAG, NULL);
+ tmp = jk_map_get_string(map, JK_LOG_LEVEL_TAG, NULL);
if (tmp) {
log_level = jk_parse_log_level(tmp);
}
else {
ok = JK_FALSE;
}
- tmp = map_get_string(map, EXTENSION_URI_TAG, NULL);
+ tmp = jk_map_get_string(map, EXTENSION_URI_TAG, NULL);
if (tmp) {
strcpy(extension_uri, tmp);
}
else {
ok = JK_FALSE;
}
- tmp = map_get_string(map, JK_WORKER_FILE_TAG, NULL);
+ tmp = jk_map_get_string(map, JK_WORKER_FILE_TAG, NULL);
if (tmp) {
strcpy(worker_file, tmp);
}
else {
ok = JK_FALSE;
}
- tmp = map_get_string(map, JK_MOUNT_FILE_TAG, NULL);
+ tmp = jk_map_get_string(map, JK_MOUNT_FILE_TAG, NULL);
if (tmp) {
strcpy(worker_mount_file, tmp);
}
else {
ok = JK_FALSE;
}
- tmp = map_get_string(map, URI_SELECT_TAG, NULL);
+ tmp = jk_map_get_string(map, URI_SELECT_TAG, NULL);
if (tmp) {
int opt = parse_uri_select(tmp);
if (opt >= 0) {
1.8 +5 -5
jakarta-tomcat-connectors/jk/native/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/isapi/jk_isapi_plugin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_isapi_plugin.c 5 Nov 2004 15:28:39 -0000 1.7
+++ jk_isapi_plugin.c 9 Nov 2004 12:17:44 -0000 1.8
@@ -973,8 +973,8 @@
DEBUG(("Initialising worker map\n"));
- if (map_alloc(&map)) {
- if (map_read_properties(map, workerMountFile))
+ if (jk_map_alloc(&map)) {
+ if (jk_map_read_properties(map, workerMountFile))
if (uri_worker_map_alloc(&uw_map, map, logger))
ok = JK_TRUE;
jk_map_free(&map);
@@ -985,9 +985,9 @@
if (ok) {
ok = JK_FALSE;
DEBUG(("About to allocate map\n"));
- if (map_alloc(&map)) {
+ if (jk_map_alloc(&map)) {
DEBUG(("About to read %s\n", workerFile));
- if (map_read_properties(map, workerFile)) {
+ if (jk_map_read_properties(map, workerFile)) {
#if defined(JK_VERSION) && JK_VERSION >= MAKEVERSION(1, 2, 0, 1)
char server[256];
1.15 +3 -3
jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c
Index: jk_nsapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_nsapi_plugin.c 5 Nov 2004 15:28:39 -0000 1.14
+++ jk_nsapi_plugin.c 9 Nov 2004 12:17:44 -0000 1.15
@@ -232,8 +232,8 @@
logger = NULL;
}
- if (map_alloc(&init_map)) {
- if (map_read_properties(init_map, worker_prp_file)) {
+ if (jk_map_alloc(&init_map)) {
+ if (jk_map_read_properties(init_map, worker_prp_file)) {
int sleep_cnt;
SYS_THREAD s;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
