Author: rjung
Date: Thu Dec 25 17:38:06 2014
New Revision: 1647909
URL: http://svn.apache.org/r1647909
Log:
Drop to unused functions.
Modified:
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/native/common/jk_util.h
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1647909&r1=1647908&r2=1647909&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Thu Dec 25 17:38:06 2014
@@ -877,42 +877,6 @@ const char *jk_get_worker_secret(jk_map_
return jk_map_get_string(m, buf, NULL);
}
-/* [V] I suggest that the following general purpose functions be used. */
-/* More should be added (double etc.), but now these were enough for me. */
-/* Functions that can be simulated with these should be "deprecated". */
-
-int jk_get_worker_str_prop(jk_map_t *m,
- const char *wname, const char *pname, const char
**prop)
-{
- char buf[PARAM_BUFFER_SIZE];
-
- if (m && prop && wname && pname) {
- MAKE_WORKER_PARAM(pname);
- *prop = jk_map_get_string(m, buf, NULL);
- if (*prop) {
- return JK_TRUE;
- }
- }
- return JK_FALSE;
-}
-
-int jk_get_worker_int_prop(jk_map_t *m,
- const char *wname, const char *pname, int *prop)
-{
- char buf[PARAM_BUFFER_SIZE];
-
- if (m && prop && wname && pname) {
- int i;
- MAKE_WORKER_PARAM(pname);
- i = jk_map_get_int(m, buf, -1);
- if (-1 != i) {
- *prop = i;
- return JK_TRUE;
- }
- }
- return JK_FALSE;
-}
-
const char *jk_get_worker_host(jk_map_t *m, const char *wname, const char *def)
{
char buf[PARAM_BUFFER_SIZE];
Modified: tomcat/jk/trunk/native/common/jk_util.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.h?rev=1647909&r1=1647908&r2=1647909&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_util.h (original)
+++ tomcat/jk/trunk/native/common/jk_util.h Thu Dec 25 17:38:06 2014
@@ -58,13 +58,6 @@ int jk_log(jk_logger_t *l,
const char *file, int line, const char *funcname, int level,
const char *fmt, ...);
-/* [V] Two general purpose functions. Should ease the function bloat. */
-int jk_get_worker_str_prop(jk_map_t *m,
- const char *wname, const char *pname, const char
**prop);
-
-int jk_get_worker_int_prop(jk_map_t *m,
- const char *wname, const char *pname, int *prop);
-
const char *jk_get_worker_host(jk_map_t *m, const char *wname, const char
*def);
const char *jk_get_worker_type(jk_map_t *m, const char *wname);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
