Author: mturk
Date: Fri Apr 11 12:23:44 2014
New Revision: 1586627
URL: http://svn.apache.org/r1586627
Log:
Cannot do pointer arithmetic on void
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1586627&r1=1586626&r2=1586627&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Fri Apr 11 12:23:44 2014
@@ -339,7 +339,7 @@ void jk_clone_sockaddr(jk_sockaddr_t *ou
* Do not copy the pointer but use the same offset relative
* to the struct start
*/
- out->ipaddr_ptr = (void *)out + (in->ipaddr_ptr - (void *)in);
+ out->ipaddr_ptr = (char *)out + ((char *)in->ipaddr_ptr - (char *)in);
}
/** Resolve the host IP
@@ -443,7 +443,7 @@ int jk_resolve(const char *host, int por
#endif
hints.ai_family = JK_INET;
if (port > 0) {
- snprintf(pbuf, port, sizeof(pbuf));
+ snprintf(pbuf, sizeof(pbuf), "%d", port);
pbufptr = pbuf;
}
error = getaddrinfo(host, pbufptr, &hints, &ai_list);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
