summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-02-21 11:42:49 -0800
committerGiampaolo Rodola <g.rodola@gmail.com>2019-02-21 11:42:49 -0800
commit3e61671deb33d0ad8bdcd6c162921c58a40ff759 (patch)
tree259cfd0f2c38653af8b2917b69bfc37da4a7e603
parent9eb7498412289e2f2a3ed7b9326d17ab74d4ee12 (diff)
downloadpsutil-3e61671deb33d0ad8bdcd6c162921c58a40ff759.tar.gz
remove deprecated WSAAddressToStringA causing a compiler warning and use UNICODE version instead
-rw-r--r--psutil/arch/windows/inet_ntop.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/psutil/arch/windows/inet_ntop.c b/psutil/arch/windows/inet_ntop.c
index 4b6c1dfe..f36bac2d 100644
--- a/psutil/arch/windows/inet_ntop.c
+++ b/psutil/arch/windows/inet_ntop.c
@@ -9,10 +9,7 @@
// From: https://memset.wordpress.com/2010/10/09/inet_ntop-for-win32/
PCSTR WSAAPI
-inet_ntop(__in INT family,
- __in PVOID pAddr,
- __out_ecount(StringBufSize) PSTR pStringBuf,
- __in size_t StringBufSize) {
+inet_ntop(INT family, PVOID pAddr, PSTR stringBuf, size_t strBufSize) {
DWORD dwAddressLength = 0;
struct sockaddr_storage srcaddr;
struct sockaddr_in *srcaddr4 = (struct sockaddr_in*) &srcaddr;
@@ -34,13 +31,15 @@ inet_ntop(__in INT family,
return NULL;
}
- if (WSAAddressToString((LPSOCKADDR) &srcaddr,
- dwAddressLength,
- 0,
- pStringBuf,
- (LPDWORD) &StringBufSize) != 0) {
+ if (WSAAddressToStringW(
+ (LPSOCKADDR) &srcaddr,
+ dwAddressLength,
+ 0,
+ (LPWSTR) stringBuf,
+ (LPDWORD) &strBufSize) != 0)
+ {
PyErr_SetExcFromWindowsErr(PyExc_OSError, WSAGetLastError());
return NULL;
}
- return pStringBuf;
+ return stringBuf;
}