@@ -90,46 +90,46 @@ class REQUEST_STORED_CONTEXT : public IHttpStoredContext
9090
9191char *GetIpAddr (apr_pool_t *pool, PSOCKADDR pAddr)
9292{
93- if (pAddr == NULL ) {
94- return " " ;
95- }
96-
97- DWORD addrSize = pAddr->sa_family == AF_INET ? sizeof (SOCKADDR_IN) : sizeof (SOCKADDR_IN6);
98- char * buf = (char *)apr_palloc (pool, NI_MAXHOST);
99- if (buf == NULL ) {
100- return " " ;
101- }
102- buf[0 ] = ' \0 ' ;
103-
104- if (GetNameInfo (pAddr, addrSize, buf, NI_MAXHOST, NULL , 0 , NI_NUMERICHOST) != 0 ) {
105- return " " ;
106- }
107-
108- return buf;
93+ if (pAddr == nullptr ) {
94+ return apr_pstrdup (pool, " " ) ;
95+ }
96+
97+ DWORD addrSize = pAddr->sa_family == AF_INET ? sizeof (SOCKADDR_IN) : sizeof (SOCKADDR_IN6);
98+ auto buf = (char *)apr_palloc (pool, NI_MAXHOST);
99+ if (buf == nullptr ) {
100+ return apr_pstrdup (pool, " " ) ;
101+ }
102+ buf[0 ] = ' \0 ' ;
103+
104+ if (GetNameInfo (pAddr, addrSize, buf, NI_MAXHOST, nullptr , 0 , NI_NUMERICHOST) != 0 ) {
105+ return apr_pstrdup (pool, " " ) ;
106+ }
107+
108+ return buf;
109109}
110110
111111apr_sockaddr_t *CopySockAddr (apr_pool_t *pool, PSOCKADDR pAddr)
112112{
113113 apr_sockaddr_t *addr = (apr_sockaddr_t *)apr_palloc (pool, sizeof (apr_sockaddr_t ));
114114
115- addr->pool = pool;
116- addr->hostname = " unknown" ;
117- addr->servname = addr->hostname ;
118- addr->family = AF_UNSPEC;
119- addr->addr_str_len = 0 ;
120- addr->ipaddr_len = 0 ;
121- addr->ipaddr_ptr = NULL ;
122- addr->salen = 0 ;
123- addr->port = 0 ;
124-
125- if (pAddr == NULL ) {
115+ addr->pool = pool;
116+ addr->hostname = " unknown" ;
117+ addr->servname = addr->hostname ;
118+ addr->family = AF_UNSPEC;
119+ addr->addr_str_len = 0 ;
120+ addr->ipaddr_len = 0 ;
121+ addr->ipaddr_ptr = nullptr ;
122+ addr->salen = 0 ;
123+ addr->port = 0 ;
124+
125+ if (pAddr == nullptr ) {
126126 return addr;
127127 }
128128
129129 addr->family = pAddr->sa_family ;
130130
131131 if (pAddr->sa_family == AF_INET) {
132- SOCKADDR_IN * sin = (SOCKADDR_IN *)pAddr;
132+ auto sin = (SOCKADDR_IN *)pAddr;
133133 addr->addr_str_len = INET_ADDRSTRLEN;
134134 addr->ipaddr_len = sizeof (struct in_addr );
135135 addr->ipaddr_ptr = &addr->sa .sin .sin_addr ;
@@ -140,7 +140,7 @@ apr_sockaddr_t *CopySockAddr(apr_pool_t *pool, PSOCKADDR pAddr)
140140 addr->salen = sizeof (addr->sa );
141141 addr->port = ntohs (sin->sin_port );
142142 } else if (pAddr->sa_family == AF_INET6) {
143- SOCKADDR_IN6 * sin6 = (SOCKADDR_IN6 *)pAddr;
143+ auto sin6 = (SOCKADDR_IN6 *)pAddr;
144144 addr->addr_str_len = INET6_ADDRSTRLEN;
145145 addr->ipaddr_len = sizeof (struct in6_addr );
146146 addr->ipaddr_ptr = &addr->sa .sin6 .sin6_addr ;
0 commit comments