Author: rjung
Date: Sun Dec 21 13:46:04 2014
New Revision: 1647142
URL: http://svn.apache.org/r1647142
Log:
Remove unused code.
Modified:
tomcat/jk/trunk/native/common/jk_shm.c
tomcat/jk/trunk/native/common/jk_shm.h
Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1647142&r1=1647141&r2=1647142&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Sun Dec 21 13:46:04 2014
@@ -762,24 +762,6 @@ void jk_shm_close(jk_logger_t *l)
#endif
-void *jk_shm_alloc(jk_pool_t *p)
-{
- void *rc = NULL;
-
- if (jk_shmem.hdr) {
- jk_shm_lock();
- if ((jk_shmem.hdr->h.data.size - jk_shmem.hdr->h.data.pos) >=
JK_SHM_SLOT_SIZE) {
- rc = &(jk_shmem.hdr->buf[jk_shmem.hdr->h.data.pos]);
- jk_shmem.hdr->h.data.pos += JK_SHM_SLOT_SIZE;
- }
- jk_shm_unlock();
- }
- else if (p)
- rc = jk_pool_alloc(p, JK_SHM_SLOT_SIZE);
-
- return rc;
-}
-
jk_shm_worker_header_t *jk_shm_alloc_worker(jk_pool_t *p, int type,
int parent_id, const char *name)
{
Modified: tomcat/jk/trunk/native/common/jk_shm.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=1647142&r1=1647141&r2=1647142&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.h (original)
+++ tomcat/jk/trunk/native/common/jk_shm.h Sun Dec 21 13:46:04 2014
@@ -205,11 +205,6 @@ int jk_shm_attach(const char *fname, int
/* allocate shm memory
* If there is no shm present the pool will be used instead
*/
-void *jk_shm_alloc(jk_pool_t *p);
-
-/* allocate shm memory
- * If there is no shm present the pool will be used instead
- */
jk_shm_worker_header_t *jk_shm_alloc_worker(jk_pool_t *p, int type,
int parent_id, const char *name);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
