You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2022/06/23 18:18:43 UTC
[tomcat-connectors] branch main updated: Drop unused logger argument in two basic functions
This is an automated email from the ASF dual-hosted git repository.
rjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 34f5d4d93 Drop unused logger argument in two basic functions
34f5d4d93 is described below
commit 34f5d4d93843bda662f4830ad1b5a08501ac707d
Author: Rainer Jung <ra...@kippdata.de>
AuthorDate: Thu Jun 23 20:18:33 2022 +0200
Drop unused logger argument in two basic functions
---
native/common/jk_status.c | 20 ++++++++++----------
native/common/jk_uri_worker_map.c | 20 ++++++++++----------
native/common/jk_uri_worker_map.h | 4 ++--
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/native/common/jk_status.c b/native/common/jk_status.c
index 7230726ff..c21b8fcb8 100644
--- a/native/common/jk_status.c
+++ b/native/common/jk_status.c
@@ -1660,8 +1660,8 @@ static void display_map(jk_ws_service_t *s,
jk_printf(s, l, JK_STATUS_URI_MAP_TABLE_ROW2,
server_name,
uwr->uri,
- uri_worker_map_get_match(uwr, buf, l),
- uri_worker_map_get_source(uwr, l),
+ uri_worker_map_get_match(uwr, buf),
+ uri_worker_map_get_source(uwr),
uwr->extensions.reply_timeout,
uwr->extensions.sticky_ignore,
uwr->extensions.stateless,
@@ -1673,8 +1673,8 @@ static void display_map(jk_ws_service_t *s,
else
jk_printf(s, l, JK_STATUS_URI_MAP_TABLE_ROW,
uwr->uri,
- uri_worker_map_get_match(uwr, buf, l),
- uri_worker_map_get_source(uwr, l),
+ uri_worker_map_get_match(uwr, buf),
+ uri_worker_map_get_source(uwr),
uwr->extensions.reply_timeout,
uwr->extensions.sticky_ignore,
uwr->extensions.stateless,
@@ -1690,8 +1690,8 @@ static void display_map(jk_ws_service_t *s,
if (server_name)
jk_print_xml_att_string(s, l, 8, "server", server_name);
jk_print_xml_att_string(s, l, 8, "uri", uwr->uri);
- jk_print_xml_att_string(s, l, 8, "type", uri_worker_map_get_match(uwr, buf, l));
- jk_print_xml_att_string(s, l, 8, "source", uri_worker_map_get_source(uwr, l));
+ jk_print_xml_att_string(s, l, 8, "type", uri_worker_map_get_match(uwr, buf));
+ jk_print_xml_att_string(s, l, 8, "source", uri_worker_map_get_source(uwr));
jk_print_xml_att_int(s, l, 8, "reply_timeout", uwr->extensions.reply_timeout);
jk_print_xml_att_int(s, l, 8, "sticky_ignore", uwr->extensions.sticky_ignore);
jk_print_xml_att_int(s, l, 8, "stateless", uwr->extensions.stateless);
@@ -1708,8 +1708,8 @@ static void display_map(jk_ws_service_t *s,
if (server_name)
jk_printf(s, l, " server=\"%s\"", server_name);
jk_printf(s, l, " uri=\"%s\"", uwr->uri);
- jk_printf(s, l, " type=\"%s\"", uri_worker_map_get_match(uwr, buf, l));
- jk_printf(s, l, " source=\"%s\"", uri_worker_map_get_source(uwr, l));
+ jk_printf(s, l, " type=\"%s\"", uri_worker_map_get_match(uwr, buf));
+ jk_printf(s, l, " source=\"%s\"", uri_worker_map_get_source(uwr));
jk_printf(s, l, " reply_timeout=\"%d\"", uwr->extensions.reply_timeout);
jk_printf(s, l, " sticky_ignore=\"%d\"", uwr->extensions.sticky_ignore);
jk_printf(s, l, " stateless=\"%d\"", uwr->extensions.stateless);
@@ -1724,8 +1724,8 @@ static void display_map(jk_ws_service_t *s,
if (server_name)
jk_print_prop_item_string(s, l, w, worker, "map", count, "server", server_name);
jk_print_prop_item_string(s, l, w, worker, "map", count, "uri", uwr->uri);
- jk_print_prop_item_string(s, l, w, worker, "map", count, "type", uri_worker_map_get_match(uwr, buf, l));
- jk_print_prop_item_string(s, l, w, worker, "map", count, "source", uri_worker_map_get_source(uwr, l));
+ jk_print_prop_item_string(s, l, w, worker, "map", count, "type", uri_worker_map_get_match(uwr, buf));
+ jk_print_prop_item_string(s, l, w, worker, "map", count, "source", uri_worker_map_get_source(uwr));
jk_print_prop_item_int(s, l, w, worker, "map", count, "reply_timeout", uwr->extensions.reply_timeout);
jk_print_prop_item_int(s, l, w, worker, "map", count, "sticky_ignore", uwr->extensions.sticky_ignore);
jk_print_prop_item_int(s, l, w, worker, "map", count, "stateless", uwr->extensions.stateless);
diff --git a/native/common/jk_uri_worker_map.c b/native/common/jk_uri_worker_map.c
index f254a21ae..118c6150f 100644
--- a/native/common/jk_uri_worker_map.c
+++ b/native/common/jk_uri_worker_map.c
@@ -70,13 +70,13 @@ static const char *uri_worker_map_source_type[] = {
/* Return the string representation of the uwr source */
-const char *uri_worker_map_get_source(uri_worker_record_t *uwr, jk_logger_t *l)
+const char *uri_worker_map_get_source(uri_worker_record_t *uwr)
{
return uri_worker_map_source_type[uwr->source_type];
}
/* Return the string representation of the uwr match type */
-char *uri_worker_map_get_match(uri_worker_record_t *uwr, char *buf, jk_logger_t *l)
+char *uri_worker_map_get_match(uri_worker_record_t *uwr, char *buf)
{
unsigned int match;
@@ -197,8 +197,8 @@ static void uri_worker_map_dump(jk_uri_worker_map_t *uw_map,
"source=%s type=%s len=%d",
i ? "NEXT" : "THIS", i, j,
STRNULL_FOR_NULL(uwr->uri), STRNULL_FOR_NULL(uwr->worker_name),
- STRNULL_FOR_NULL(uwr->context), STRNULL_FOR_NULL(uri_worker_map_get_source(uwr,l)),
- STRNULL_FOR_NULL(uri_worker_map_get_match(uwr,buf,l)), uwr->context_len);
+ STRNULL_FOR_NULL(uwr->context), STRNULL_FOR_NULL(uri_worker_map_get_source(uwr)),
+ STRNULL_FOR_NULL(uri_worker_map_get_match(uwr, buf)), uwr->context_len);
}
}
}
@@ -356,7 +356,7 @@ static int uri_worker_map_clear(jk_uri_worker_map_t *uw_map,
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"deleting map rule '%s=%s' source '%s'",
- uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr, l));
+ uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr));
}
else {
IND_NEXT(uw_map->maps)[new_size] = uwr;
@@ -846,7 +846,7 @@ int uri_worker_map_add(jk_uri_worker_map_t *uw_map,
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"wildchar rule '%s=%s' source '%s' was added",
- uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr, l));
+ uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr));
}
else {
@@ -855,7 +855,7 @@ int uri_worker_map_add(jk_uri_worker_map_t *uw_map,
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"exact rule '%s=%s' source '%s' was added",
- uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr, l));
+ uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr));
}
}
else {
@@ -975,7 +975,7 @@ static int find_match(jk_uri_worker_map_t *uw_map,
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG, "Attempting to map context URI '%s=%s' source '%s'",
- uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr, l));
+ uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr));
if (uwr->match_type & MATCH_TYPE_WILDCHAR_PATH) {
/* Map is already sorted by context_len */
@@ -1042,7 +1042,7 @@ static int is_nomatch(jk_uri_worker_map_t *uw_map,
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Found a wildchar no match '%s=%s' source '%s'",
- uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr, l));
+ uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr));
JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -1052,7 +1052,7 @@ static int is_nomatch(jk_uri_worker_map_t *uw_map,
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Found an exact no match '%s=%s' source '%s'",
- uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr, l));
+ uwr->context, uwr->worker_name, uri_worker_map_get_source(uwr));
JK_TRACE_EXIT(l);
return JK_TRUE;
}
diff --git a/native/common/jk_uri_worker_map.h b/native/common/jk_uri_worker_map.h
index c52e0b905..857cc8bff 100644
--- a/native/common/jk_uri_worker_map.h
+++ b/native/common/jk_uri_worker_map.h
@@ -184,9 +184,9 @@ void extension_fix(jk_pool_t *p, const char *name,
void parse_rule_extensions(char *rule, rule_extension_t *extensions,
jk_logger_t *l);
-const char *uri_worker_map_get_source(uri_worker_record_t *uwr, jk_logger_t *l);
+const char *uri_worker_map_get_source(uri_worker_record_t *uwr);
-char *uri_worker_map_get_match(uri_worker_record_t *uwr, char *buf, jk_logger_t *l);
+char *uri_worker_map_get_match(uri_worker_record_t *uwr, char *buf);
int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map,
jk_map_t *init_data, jk_logger_t *l);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org