Author: rjung
Date: Sat Dec 27 13:45:17 2014
New Revision: 1648054
URL: http://svn.apache.org/r1648054
Log:
Rename new defines from *_SIZE to *_LEN to reflect
more clearly their meaning (string length excluding
final '\0'.
We don't use this convention everywhere, but it
will soon help to make a distinction to
JK_SHM_STR_SIZ.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/common/jk_shm.h
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1648054&r1=1648053&r2=1648054&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sat Dec 27 13:45:17 2014
@@ -2982,7 +2982,7 @@ static void jk_init(server_rec * s, ap_p
remain = jk_check_buffer_size();
if (remain < 0) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, srv, p,
- "mod_jk: JK_MAX_ATTRIBUTE_NAME_SIZE in jk_util.c is too
small, "
+ "mod_jk: JK_MAX_ATTRIBUTE_NAME_LEN in jk_util.c is too
small, "
"increase by %d", -1 * remain);
}
if (!jk_worker_properties)
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1648054&r1=1648053&r2=1648054&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Sat Dec 27 13:45:17 2014
@@ -3430,7 +3430,7 @@ static int jk_post_config(apr_pool_t * p
remain = jk_check_buffer_size();
if (remain < 0) {
ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
- "mod_jk: JK_MAX_ATTRIBUTE_NAME_SIZE in jk_util.c is too
small, "
+ "mod_jk: JK_MAX_ATTRIBUTE_NAME_LEN in jk_util.c is too
small, "
"increase by %d", -1 * remain);
return HTTP_INTERNAL_SERVER_ERROR;
}
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1648054&r1=1648053&r2=1648054&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Sat Dec 27 13:45:17 2014
@@ -188,7 +188,7 @@ extern "C"
#define JK_LF (10)
#define JK_CR (13)
-#define JK_MAX_NAME_SIZE (60)
+#define JK_MAX_NAME_LEN (60)
#define JK_SESSION_IDENTIFIER "JSESSIONID"
#define JK_PATH_SESSION_IDENTIFIER ";jsessionid"
Modified: tomcat/jk/trunk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=1648054&r1=1648053&r2=1648054&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.h (original)
+++ tomcat/jk/trunk/native/common/jk_shm.h Sat Dec 27 13:45:17 2014
@@ -42,7 +42,7 @@ extern "C"
#define JK_SHM_MAJOR '1'
#define JK_SHM_MINOR '3'
-#define JK_SHM_STR_SIZ (JK_ALIGN(JK_MAX_NAME_SIZE + 1, 8) - 1)
+#define JK_SHM_STR_SIZ (JK_ALIGN(JK_MAX_NAME_LEN + 1, 8) - 1)
#define JK_SHM_MAGIC '!', 'J', 'K', 'S', 'H', 'M', JK_SHM_MAJOR,
JK_SHM_MINOR
#define JK_SHM_MAGIC_SIZ 8
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1648054&r1=1648053&r2=1648054&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Sat Dec 27 13:45:17 2014
@@ -133,8 +133,8 @@
* Add space for "worker.", another ".", the
* worker name and the final '\0'.
*/
-#define JK_MAX_ATTRIBUTE_NAME_SIZE (30)
-#define PARAM_BUFFER_SIZE (JK_MAX_NAME_SIZE + 8 + JK_MAX_ATTRIBUTE_NAME_SIZE +
1)
+#define JK_MAX_ATTRIBUTE_NAME_LEN (30)
+#define PARAM_BUFFER_SIZE (JK_MAX_NAME_LEN + 8 + JK_MAX_ATTRIBUTE_NAME_LEN + 1)
#define MAKE_WORKER_PARAM(P) \
{ \
size_t remain = PARAM_BUFFER_SIZE; \
@@ -1863,7 +1863,7 @@ int jk_check_buffer_size()
max_len = len;
props++;
}
- return JK_MAX_ATTRIBUTE_NAME_SIZE - max_len;
+ return JK_MAX_ATTRIBUTE_NAME_LEN - max_len;
}
/*
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1648054&r1=1648053&r2=1648054&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sat Dec 27 13:45:17 2014
@@ -2949,7 +2949,7 @@ static int read_registry_init_data(void)
remain = jk_check_buffer_size();
if (remain < 0) {
jk_log(logger, JK_LOG_ERROR,
- "mod_jk: JK_MAX_ATTRIBUTE_NAME_SIZE in jk_util.c is too small, "
+ "mod_jk: JK_MAX_ATTRIBUTE_NAME_LEN in jk_util.c is too small, "
"increase by %d", -1 * remain);
}
if (jk_map_alloc(&map)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
