Author: mturk
Date: Mon Oct 31 12:44:39 2011
New Revision: 1195434
URL: http://svn.apache.org/viewvc?rev=1195434&view=rev
Log:
Fix weird jk_pool_strdup declaration and add jk_pool_strcat function
Modified:
tomcat/jk/trunk/native/common/jk_pool.c
tomcat/jk/trunk/native/common/jk_pool.h
Modified: tomcat/jk/trunk/native/common/jk_pool.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.c?rev=1195434&r1=1195433&r2=1195434&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_pool.c (original)
+++ tomcat/jk/trunk/native/common/jk_pool.c Mon Oct 31 12:44:39 2011
@@ -95,9 +95,9 @@ void *jk_pool_realloc(jk_pool_t *p, size
return rc;
}
-void *jk_pool_strdup(jk_pool_t *p, const char *s)
+char *jk_pool_strdup(jk_pool_t *p, const char *s)
{
- void *rc = NULL;
+ char *rc = NULL;
if (s && p) {
size_t size = strlen(s);
@@ -115,6 +115,28 @@ void *jk_pool_strdup(jk_pool_t *p, const
return rc;
}
+char *jk_pool_strcat(jk_pool_t *p, const char *s, const char *a)
+{
+ char *rc = NULL;
+ if (s && p) {
+ size_t size = strlen(s);
+ if (a)
+ size += strlen(a);
+ if (size == 0) {
+ return "";
+ }
+ size++;
+ rc = jk_pool_alloc(p, size);
+ if (rc) {
+ if (rc != s)
+ strcpy(rc, s);
+ strcat(rc, a);
+ }
+ }
+
+ return rc;
+}
+
#if defined (DEBUG) || defined(_DEBUG)
static void jk_dump_pool(jk_pool_t *p, FILE * f)
{
Modified: tomcat/jk/trunk/native/common/jk_pool.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.h?rev=1195434&r1=1195433&r2=1195434&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_pool.h (original)
+++ tomcat/jk/trunk/native/common/jk_pool.h Mon Oct 31 12:44:39 2011
@@ -118,7 +118,9 @@ void *jk_pool_alloc(jk_pool_t *p, size_t
void *jk_pool_realloc(jk_pool_t *p,
size_t sz, const void *old, size_t old_sz);
-void *jk_pool_strdup(jk_pool_t *p, const char *s);
+char *jk_pool_strdup(jk_pool_t *p, const char *s);
+
+char *jk_pool_strdcat(jk_pool_t *p, const char *s, const char *a);
#ifdef __cplusplus
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
