1818#define inline inline
1919
2020#include " winsock2.h"
21- #include < Ws2tcpip.h>
2221
2322// IIS7 Server API header file
2423#include < Windows.h>
@@ -91,19 +90,19 @@ class REQUEST_STORED_CONTEXT : public IHttpStoredContext
9190
9291char *GetIpAddr (apr_pool_t *pool, PSOCKADDR pAddr)
9392{
94- if (pAddr == NULL ) {
95- return " " ;
93+ if (pAddr == nullptr ) {
94+ return apr_pstrdup (pool, " " ) ;
9695 }
9796
9897 DWORD addrSize = pAddr->sa_family == AF_INET ? sizeof (SOCKADDR_IN) : sizeof (SOCKADDR_IN6);
99- char * buf = (char *)apr_palloc (pool, NI_MAXHOST);
100- if (buf == NULL ) {
101- return " " ;
98+ auto buf = (char *)apr_palloc (pool, NI_MAXHOST);
99+ if (buf == nullptr ) {
100+ return apr_pstrdup (pool, " " ) ;
102101 }
103102 buf[0 ] = ' \0 ' ;
104103
105- if (GetNameInfo (pAddr, addrSize, buf, NI_MAXHOST, NULL , 0 , NI_NUMERICHOST) != 0 ) {
106- return " " ;
104+ if (GetNameInfo (pAddr, addrSize, buf, NI_MAXHOST, nullptr , 0 , NI_NUMERICHOST) != 0 ) {
105+ return apr_pstrdup (pool, " " ) ;
107106 }
108107
109108 return buf;
@@ -119,18 +118,18 @@ apr_sockaddr_t *CopySockAddr(apr_pool_t *pool, PSOCKADDR pAddr)
119118 addr->family = AF_UNSPEC;
120119 addr->addr_str_len = 0 ;
121120 addr->ipaddr_len = 0 ;
122- addr->ipaddr_ptr = NULL ;
121+ addr->ipaddr_ptr = nullptr ;
123122 addr->salen = 0 ;
124123 addr->port = 0 ;
125124
126- if (pAddr == NULL ) {
125+ if (pAddr == nullptr ) {
127126 return addr;
128127 }
129128
130129 addr->family = pAddr->sa_family ;
131130
132131 if (pAddr->sa_family == AF_INET) {
133- SOCKADDR_IN * sin = (SOCKADDR_IN *)pAddr;
132+ auto sin = (SOCKADDR_IN *)pAddr;
134133 addr->addr_str_len = INET_ADDRSTRLEN;
135134 addr->ipaddr_len = sizeof (struct in_addr );
136135 addr->ipaddr_ptr = &addr->sa .sin .sin_addr ;
@@ -141,7 +140,7 @@ apr_sockaddr_t *CopySockAddr(apr_pool_t *pool, PSOCKADDR pAddr)
141140 addr->salen = sizeof (addr->sa );
142141 addr->port = ntohs (sin->sin_port );
143142 } else if (pAddr->sa_family == AF_INET6) {
144- SOCKADDR_IN6 * sin6 = (SOCKADDR_IN6 *)pAddr;
143+ auto sin6 = (SOCKADDR_IN6 *)pAddr;
145144 addr->addr_str_len = INET6_ADDRSTRLEN;
146145 addr->ipaddr_len = sizeof (struct in6_addr );
147146 addr->ipaddr_ptr = &addr->sa .sin6 .sin6_addr ;
0 commit comments