You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2007/03/13 23:36:46 UTC
svn commit: r517915 - /tomcat/connectors/trunk/jk/native/common/jk_map.c
Author: rjung
Date: Tue Mar 13 15:36:44 2007
New Revision: 517915
URL: http://svn.apache.org/viewvc?view=rev&rev=517915
Log:
Fix compiler error (variable declaration inside code).
Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=517915&r1=517914&r2=517915
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Tue Mar 13 15:36:44 2007
@@ -713,17 +713,19 @@
int jk_map_inherit_properties(jk_map_t *m, const char *from, const char *to, jk_logger_t *l)
{
int rc = JK_FALSE;
+ const char *prp;
+ char *to_prp;
if (m && from && to) {
unsigned int i;
for (i = 0; i < m->size; i++) {
if (!strncmp(m->names[i], from, strlen(from))) {
rc = JK_TRUE;
- const char *prp = m->names[i] + strlen(from);
- char *to_prp = jk_pool_alloc(&m->p,
- (sizeof(char) *
- (strlen(to) +
- strlen(prp) + 1)));
+ prp = m->names[i] + strlen(from);
+ to_prp = jk_pool_alloc(&m->p,
+ (sizeof(char) *
+ (strlen(to) +
+ strlen(prp) + 1)));
if (!to_prp) {
jk_log(l, JK_LOG_ERROR,
"Error in string allocation for attribute '%s.%s'",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org