Author: mturk
Date: Wed Nov 16 07:56:12 2011
New Revision: 1202568
URL: http://svn.apache.org/viewvc?rev=1202568&view=rev
Log:
Axe useless dump on malloc failure. Most fprintf implementations also use
malloc so it is likely they'll fail as well
Modified:
tomcat/jk/trunk/native/common/jk_pool.c
Modified: tomcat/jk/trunk/native/common/jk_pool.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.c?rev=1202568&r1=1202567&r2=1202568&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_pool.c (original)
+++ tomcat/jk/trunk/native/common/jk_pool.c Wed Nov 16 07:56:12 2011
@@ -18,7 +18,7 @@
/***************************************************************************
* Description: Simple memory pool *
* Author: Gal Shachor <shac...@il.ibm.com> *
- * Version: $Revision$ *
+ * Version: $Revision$ *
***************************************************************************/
#include "jk_pool.h"
@@ -170,21 +170,6 @@ char *jk_pool_strcatv(jk_pool_t *p, ...)
return rc;
}
-#if defined (DEBUG) || defined(_DEBUG)
-static void jk_dump_pool(jk_pool_t *p, FILE * f)
-{
- fprintf(f, "Dumping for pool [%p]\n", p);
- fprintf(f, "size [%u]\n", (unsigned int)p->size);
- fprintf(f, "pos [%u]\n", (unsigned int)p->pos);
- fprintf(f, "buf [%d]\n", p->buf ? 1 : 0);
- fprintf(f, "dyn_size [%d]\n", (unsigned int)p->dyn_size);
- fprintf(f, "dyn_pos [%d]\n", (unsigned int)p->dyn_pos);
- fprintf(f, "dynamic [%d]\n", p->dynamic ? 1 : 0);
-
- fflush(f);
-}
-#endif
-
static void *jk_pool_dyn_alloc(jk_pool_t *p, size_t size)
{
void *rc;
@@ -196,7 +181,6 @@ static void *jk_pool_dyn_alloc(jk_pool_t
if (p->dynamic) {
/* Copy old dynamic slots */
memcpy(new_dynamic, p->dynamic, p->dyn_size * sizeof(void *));
-
free(p->dynamic);
}
@@ -204,9 +188,6 @@ static void *jk_pool_dyn_alloc(jk_pool_t
p->dyn_size = new_dyn_size;
}
else {
-#if defined (DEBUG) || defined(_DEBUG)
- jk_dump_pool(p, stderr);
-#endif
return NULL;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
