1
1

BUG 97: Remove obsolete hsterror().

This function is pretty much obsolete on most platforms. The standard
errno should be used. If it is not enough on Windows we should use
WSAGetLastError() in future.
Этот коммит содержится в:
Andreas Schneider 2012-12-03 13:08:17 +01:00
родитель ab8c7de6f8
Коммит c6fc69fbdd
2 изменённых файлов: 1 добавлений и 18 удалений

Просмотреть файл

@ -117,12 +117,6 @@ if (UNIX)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} socket)
endif (HAVE_LIBSOCKET)
# libresolv
check_library_exists(resolv hstrerror "" HAVE_LIBRESOLV)
if (HAVE_LIBRESOLV)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} resolv)
endif (HAVE_LIBRESOLV)
# libnsl/inet_pton (Solaris)
check_library_exists(nsl inet_pton "" HAVE_LIBNSL)
if (HAVE_LIBNSL)

Просмотреть файл

@ -61,17 +61,6 @@
#define SOCKOPT_TYPE_ARG4 char
/*
* We need to provide hstrerror. Not we can't call the parameter h_errno
* because it's #defined
*/
static char *hstrerror(int h_errno_val) {
static char text[50] = {0};
snprintf(text, sizeof(text), "getaddrino error %d\n", h_errno_val);
return text;
}
#else /* _WIN32 */
#include <sys/socket.h>
@ -118,7 +107,7 @@ static socket_t bind_socket(ssh_bind sshbind, const char *hostname,
ssh_set_error(sshbind,
SSH_FATAL,
"Setting socket options failed: %s",
hstrerror(h_errno));
strerror(errno));
freeaddrinfo (ai);
close(s);
return -1;