Skip to content

Commit 65546f0

Browse files
committed
fix: SonarCloud issues
1 parent a273cd1 commit 65546f0

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.github/workflows/test-ci-windows.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ jobs:
8484
token: ${{ secrets.GITHUB_TOKEN }}
8585
prefix: vcpkg-iis-module-${{ matrix.arch }}/
8686

87+
- uses: ammaraskar/msvc-problem-matcher@master
88+
8789
- name: Configure CMake for IIS Module
8890
env:
8991
VCPKG_FEATURE_FLAGS: "binarycaching"
@@ -248,6 +250,7 @@ jobs:
248250
Restart-Service W3SVC -Force
249251
250252
$modules = & "$env:SystemRoot\system32\inetsrv\appcmd.exe" list modules
253+
Write-Host "IIS modules: $modules"
251254
if ($LASTEXITCODE -ne 0) {
252255
Write-Error "appcmd failed with exit code $LASTEXITCODE"
253256
exit 1

iis/mymodule.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
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

9291
char *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

Comments
 (0)