You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2020/11/23 09:33:01 UTC
svn commit: r1883742 - /apr/apr/trunk/network_io/unix/sockaddr.c
Author: ylavic
Date: Mon Nov 23 09:33:01 2020
New Revision: 1883742
URL: http://svn.apache.org/viewvc?rev=1883742&view=rev
Log:
Follow up to r1883728: uncomment the change, and fix apr_cpystrn() args orrder.
Modified:
apr/apr/trunk/network_io/unix/sockaddr.c
Modified: apr/apr/trunk/network_io/unix/sockaddr.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/sockaddr.c?rev=1883742&r1=1883741&r2=1883742&view=diff
==============================================================================
--- apr/apr/trunk/network_io/unix/sockaddr.c (original)
+++ apr/apr/trunk/network_io/unix/sockaddr.c Mon Nov 23 09:33:01 2020
@@ -118,10 +118,10 @@ static apr_status_t get_remote_addr(apr_
APR_DECLARE(apr_status_t) apr_sockaddr_ip_getbuf(char *buf, apr_size_t buflen,
apr_sockaddr_t *sockaddr)
{
-#if APR_HAVE_SOCKADDR_UN && 0
+#if APR_HAVE_SOCKADDR_UN
if (sockaddr->family == APR_UNIX) {
apr_size_t len = (apr_size_t)sockaddr->ipaddr_len;
- apr_cpystrn(buf, buflen < len ? buflen : len, sockaddr->ipaddr_ptr);
+ apr_cpystrn(buf, sockaddr->ipaddr_ptr, buflen < len ? buflen : len);
return APR_SUCCESS;
}
#endif