Author: markt
Date: Fri Aug 3 13:59:41 2018
New Revision: 1837375
URL: http://svn.apache.org/viewvc?rev=1837375&view=rev
Log:
Remove some Netware references from the common code
Modified:
tomcat/jk/trunk/native/common/jk_pool.h
tomcat/jk/trunk/native/common/jk_shm.c
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/native/common/jk_util.c
Modified: tomcat/jk/trunk/native/common/jk_pool.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.h?rev=1837375&r1=1837374&r2=1837375&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_pool.h (original)
+++ tomcat/jk/trunk/native/common/jk_pool.h Fri Aug 3 13:59:41 2018
@@ -59,8 +59,6 @@ extern "C"
typedef long long jk_pool_atom_t;
#elif defined(OS2)
typedef long long jk_pool_atom_t;
-#elif defined(NETWARE)
- typedef long long jk_pool_atom_t;
#elif defined(HPUX11)
typedef long long jk_pool_atom_t;
#elif defined(IRIX)
Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1837375&r1=1837374&r2=1837375&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Fri Aug 3 13:59:41 2018
@@ -188,7 +188,7 @@ int jk_shm_calculate_size(jk_map_t *init
}
-#if defined (WIN32) || defined(NETWARE)
+#if defined (WIN32)
/* Use plain memory */
int jk_shm_open(const char *fname, int sz, jk_logger_t *l)
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1837375&r1=1837374&r2=1837375&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Fri Aug 3 13:59:41 2018
@@ -539,24 +539,13 @@ static int jk_printf(jk_ws_service_t *s,
{
int rc = 0;
va_list args;
-#ifdef NETWARE
-/* On NetWare, this can get called on a thread that has a limited stack so */
-/* we will allocate and free the temporary buffer in this function */
- char *buf;
-#else
char buf[HUGE_BUFFER_SIZE];
-#endif
if (!s || !fmt) {
return -1;
}
va_start(args, fmt);
-#ifdef NETWARE
- buf = (char *)malloc(HUGE_BUFFER_SIZE);
- if (NULL == buf)
- return -1;
-#endif
rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args);
va_end(args);
if (rc > 0 && rc < HUGE_BUFFER_SIZE)
@@ -564,9 +553,6 @@ static int jk_printf(jk_ws_service_t *s,
else
jk_log(l, JK_LOG_WARNING,
"Insufficient buffer size %d in status worker, some output was
dropped", HUGE_BUFFER_SIZE);
-#ifdef NETWARE
- free(buf);
-#endif
return rc;
}
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1837375&r1=1837374&r2=1837375&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Fri Aug 3 13:59:41 2018
@@ -394,8 +394,6 @@ void jk_sleep(int ms)
DosSleep(ms);
#elif defined(BEOS)
snooze(ms * 1000);
-#elif defined(NETWARE)
- delay(ms);
#elif defined(WIN32)
Sleep(ms);
#else
@@ -711,13 +709,7 @@ int jk_log(jk_logger_t *l,
}
if ((l->level <= level) || (level == JK_LOG_REQUEST_LEVEL)) {
-#ifdef NETWARE
- /* On NetWare, this can get called on a thread that has a limited
stack so */
- /* we will allocate and free the temporary buffer in this function
*/
- char *buf;
-#else
char buf[LOG_BUFFER_SIZE];
-#endif
char *f = (char *)(file + strlen(file) - 1);
va_list args;
int used = 0;
@@ -729,11 +721,6 @@ int jk_log(jk_logger_t *l,
f++;
}
-#ifdef NETWARE
- buf = (char *)malloc(LOG_BUFFER_SIZE);
- if (NULL == buf)
- return -1;
-#endif
used = set_time_str(buf, usable_size, l);
if (line) { /* line==0 only used for request log item */
@@ -814,9 +801,6 @@ int jk_log(jk_logger_t *l,
}
l->log(l, level, used, buf);
-#ifdef NETWARE
- free(buf);
-#endif
}
return rc;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
