database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-25 01:02:05 +03:00
Code Activity

Remove code to lookup WinSock error strings in netmsg.dll; according to

Browse Source 
Magnus Hagander that DLL only contains error strings for the Net***
functions, *not* WinSock.  We need to look for a workable solution for
older Windows flavors ... but it won't happen for PG 7.2.
This commit is contained in:
Tom Lane
2001-12-03 00:28:24 +00:00
parent acf7aa6240
commit ae8a9b8a9f
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/interfaces/libpq/fe-misc.c
View File

@ -25,7 +25,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.64 2001/11/28 19:40:29 tgl Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.65 2001/12/03 00:28:24 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -856,18 +856,17 @@ libpq_gettext(const char *msgid)
/* /*
* strerror replacement for windows: * strerror replacement for windows:
* *
* We don't know a fix for win9x yet, but this should work for nt4 and win2k. * This works on WIN2000 and newer, but we don't know where to find WinSock
* If you can verify this working on win9x or have a solution, let us know, ok? * error strings on older Windows flavors. If you know, clue us in.
*/ */
const char * const char *
winsock_strerror(int eno) winsock_strerror(int eno)
{ {
static char err_buf[512]; static char err_buf[512];
#define WSSE_MAXLEN (sizeof(err_buf)-1-13) /* 13 == " (0x00000000)" */ #define WSSE_MAXLEN (sizeof(err_buf)-1-13) /* 13 for " (0x00000000)" */
HINSTANCE netmsgModule;
int length; int length;
/* First try the "system table", this works on Win2k pro */ /* First try the "system table", this works on Win2k and up */
if (FormatMessage( if (FormatMessage(
FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
@ -879,28 +878,7 @@ winsock_strerror(int eno)
NULL)) NULL))
goto WSSE_GOODEXIT; goto WSSE_GOODEXIT;
/* That didn't work, let's try the netmsg.dll */ /* Insert other possible lookup methods here ... */
netmsgModule = LoadLibraryEx("netmsg.dll",
NULL,
LOAD_LIBRARY_AS_DATAFILE);
if (netmsgModule != NULL)
{
if (FormatMessage(
FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_HMODULE,
netmsgModule,
eno,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
err_buf,
WSSE_MAXLEN,
NULL))
{
FreeLibrary(netmsgModule);
goto WSSE_GOODEXIT;
}
FreeLibrary(netmsgModule);
}
/* Everything failed, just tell the user that we don't know the desc */ /* Everything failed, just tell the user that we don't know the desc */