xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix return code of inet_pton under _WIN32

Browse Source
main
norbertwg 2 years ago committed by Rosen Penev
parent b1225ca9dc
commit c622ba2632
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
src/http.cpp
Unescape Escape View File

@ -202,7 +202,7 @@ int Exiv2::http(Exiv2::Dictionary& request, Exiv2::Dictionary& response, std::st
// convert unknown servername into IP address // convert unknown servername into IP address
// http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/rzab6/rzab6uafinet.htm // http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/rzab6/rzab6uafinet.htm
if (inet_pton(AF_INET, servername_p, &serv_addr.sin_addr) <= 0) { if (inet_pton(AF_INET, servername_p, &serv_addr.sin_addr) != 0) {
struct addrinfo hints = {}; struct addrinfo hints = {};
hints.ai_family = AF_INET; hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
@ -226,8 +226,8 @@ int Exiv2::http(Exiv2::Dictionary& request, Exiv2::Dictionary& response, std::st
server = connect(sockfd, reinterpret_cast<const sockaddr*>(&serv_addr), serv_len); server = connect(sockfd, reinterpret_cast<const sockaddr*>(&serv_addr), serv_len);
if (server == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) { if (server == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) {
closesocket(sockfd); closesocket(sockfd);
return error(errors, "error - unable to connect to server = %s port = %s wsa_error = %d", servername_p, port_p, return error(errors, "error - unable to connect to server = %s port = %s wsa_error = %d", servername_p,
WSAGetLastError()); std::to_string(serv_addr.sin_port).c_str(), WSAGetLastError());
} }
char buffer[32 * 1024 + 1]; char buffer[32 * 1024 + 1];

Write Preview
Loading…
Cancel
Save