Avoid warnings when using gcc 3.4

svn path=/trunk/; revision=9343
This commit is contained in:
Gé van Geldorp 2004-05-10 11:56:07 +00:00
parent a2c82e3283
commit cf6301c2d6
4 changed files with 24 additions and 22 deletions

View file

@ -36,7 +36,7 @@ int fflush(FILE *f)
__set_errno(0); __set_errno(0);
_fwalk((void (*)(FILE *))fflush); _fwalk((void (*)(FILE *))fflush);
if (_errno) if (*_errno())
return EOF; return EOF;
__set_errno(e); __set_errno(e);
return 0; return 0;

View file

@ -40,19 +40,20 @@ int getc(FILE *fp)
wint_t getwc(FILE *fp) wint_t getwc(FILE *fp)
{ {
wint_t c;
// might check on multi bytes if text mode // might check on multi bytes if text mode
if(fp->_cnt > 0) { if(fp->_cnt > 0) {
fp->_cnt -= sizeof(wchar_t); fp->_cnt -= sizeof(wchar_t);
return (wint_t )*((wchar_t *)(fp->_ptr))++; c = *((wchar_t *)(fp->_ptr));
fp->_ptr += sizeof(wchar_t);
} }
else { else {
return _filwbuf(fp); c = _filwbuf(fp);
} }
// never reached return c;
return -1;
} }

View file

@ -46,7 +46,8 @@ int putwc(wint_t c, FILE* fp)
if (fp->_cnt > 0 ) { if (fp->_cnt > 0 ) {
fp->_cnt-= sizeof(wchar_t); fp->_cnt-= sizeof(wchar_t);
*((wchar_t *)(fp->_ptr))++ = c; *((wchar_t *)(fp->_ptr)) = c;
fp->_ptr += sizeof(wchar_t);
return (wint_t)c; return (wint_t)c;
} }
else else

View file

@ -108,35 +108,35 @@ INT GetHelperDLLEntries(
/* The following functions MUST be supported */ /* The following functions MUST be supported */
e = GetProcAddress(HelperDLL->hModule, "WSHEnumProtocols"); e = GetProcAddress(HelperDLL->hModule, "WSHEnumProtocols");
if (!e) return ERROR_BAD_PROVIDER; if (!e) return ERROR_BAD_PROVIDER;
((PVOID) HelperDLL->EntryTable.lpWSHEnumProtocols) = e; HelperDLL->EntryTable.lpWSHEnumProtocols = e;
e = GetProcAddress(HelperDLL->hModule, "WSHGetSockaddrType"); e = GetProcAddress(HelperDLL->hModule, "WSHGetSockaddrType");
if (!e) return ERROR_BAD_PROVIDER; if (!e) return ERROR_BAD_PROVIDER;
((PVOID) HelperDLL->EntryTable.lpWSHGetSockaddrType) = e; HelperDLL->EntryTable.lpWSHGetSockaddrType = e;
e = GetProcAddress(HelperDLL->hModule, "WSHGetSocketInformation"); e = GetProcAddress(HelperDLL->hModule, "WSHGetSocketInformation");
if (!e) return ERROR_BAD_PROVIDER; if (!e) return ERROR_BAD_PROVIDER;
((PVOID) HelperDLL->EntryTable.lpWSHGetSocketInformation) = e; HelperDLL->EntryTable.lpWSHGetSocketInformation = e;
e = GetProcAddress(HelperDLL->hModule, "WSHGetWildcardSockaddr"); e = GetProcAddress(HelperDLL->hModule, "WSHGetWildcardSockaddr");
if (!e) return ERROR_BAD_PROVIDER; if (!e) return ERROR_BAD_PROVIDER;
((PVOID) HelperDLL->EntryTable.lpWSHGetWildcardSockaddr) = e; HelperDLL->EntryTable.lpWSHGetWildcardSockaddr = e;
e = GetProcAddress(HelperDLL->hModule, "WSHGetWinsockMapping"); e = GetProcAddress(HelperDLL->hModule, "WSHGetWinsockMapping");
if (!e) return ERROR_BAD_PROVIDER; if (!e) return ERROR_BAD_PROVIDER;
((PVOID) HelperDLL->EntryTable.lpWSHGetWinsockMapping) = e; HelperDLL->EntryTable.lpWSHGetWinsockMapping = e;
e = GetProcAddress(HelperDLL->hModule, "WSHNotify"); e = GetProcAddress(HelperDLL->hModule, "WSHNotify");
if (!e) return ERROR_BAD_PROVIDER; if (!e) return ERROR_BAD_PROVIDER;
((PVOID) HelperDLL->EntryTable.lpWSHNotify) = e; HelperDLL->EntryTable.lpWSHNotify = e;
e = GetProcAddress(HelperDLL->hModule, "WSHOpenSocket"); e = GetProcAddress(HelperDLL->hModule, "WSHOpenSocket");
if (!e) return ERROR_BAD_PROVIDER; if (!e) return ERROR_BAD_PROVIDER;
((PVOID) HelperDLL->EntryTable.lpWSHOpenSocket) = e; HelperDLL->EntryTable.lpWSHOpenSocket = e;
e = GetProcAddress(HelperDLL->hModule, "WSHSetSocketInformation"); e = GetProcAddress(HelperDLL->hModule, "WSHSetSocketInformation");
if (!e) return ERROR_BAD_PROVIDER; if (!e) return ERROR_BAD_PROVIDER;
((PVOID) HelperDLL->EntryTable.lpWSHSetSocketInformation) = e; HelperDLL->EntryTable.lpWSHSetSocketInformation = e;
/* /*
@ -144,28 +144,28 @@ INT GetHelperDLLEntries(
Whoever wants to call them, must check that the pointer is not NULL. Whoever wants to call them, must check that the pointer is not NULL.
*/ */
e = GetProcAddress(HelperDLL->hModule, "WSHAddressToString"); e = GetProcAddress(HelperDLL->hModule, "WSHAddressToString");
((PVOID) HelperDLL->EntryTable.lpWSHAddressToString) = e; HelperDLL->EntryTable.lpWSHAddressToString = e;
e = GetProcAddress(HelperDLL->hModule, "WSHGetBroadcastSockaddr"); e = GetProcAddress(HelperDLL->hModule, "WSHGetBroadcastSockaddr");
((PVOID) HelperDLL->EntryTable.lpWSHGetBroadcastSockaddr) = e; HelperDLL->EntryTable.lpWSHGetBroadcastSockaddr = e;
e = GetProcAddress(HelperDLL->hModule, "WSHGetProviderGuid"); e = GetProcAddress(HelperDLL->hModule, "WSHGetProviderGuid");
((PVOID) HelperDLL->EntryTable.lpWSHGetProviderGuid) = e; HelperDLL->EntryTable.lpWSHGetProviderGuid = e;
e = GetProcAddress(HelperDLL->hModule, "WSHGetWSAProtocolInfo"); e = GetProcAddress(HelperDLL->hModule, "WSHGetWSAProtocolInfo");
((PVOID) HelperDLL->EntryTable.lpWSHGetWSAProtocolInfo) = e; HelperDLL->EntryTable.lpWSHGetWSAProtocolInfo = e;
e = GetProcAddress(HelperDLL->hModule, "WSHIoctl"); e = GetProcAddress(HelperDLL->hModule, "WSHIoctl");
((PVOID) HelperDLL->EntryTable.lpWSHIoctl) = e; HelperDLL->EntryTable.lpWSHIoctl = e;
e = GetProcAddress(HelperDLL->hModule, "WSHJoinLeaf"); e = GetProcAddress(HelperDLL->hModule, "WSHJoinLeaf");
((PVOID) HelperDLL->EntryTable.lpWSHJoinLeaf) = e; HelperDLL->EntryTable.lpWSHJoinLeaf = e;
e = GetProcAddress(HelperDLL->hModule, "WSHOpenSocket2"); e = GetProcAddress(HelperDLL->hModule, "WSHOpenSocket2");
((PVOID) HelperDLL->EntryTable.lpWSHOpenSocket2) = e; HelperDLL->EntryTable.lpWSHOpenSocket2 = e;
e = GetProcAddress(HelperDLL->hModule, "WSHStringToAddress"); e = GetProcAddress(HelperDLL->hModule, "WSHStringToAddress");
((PVOID) HelperDLL->EntryTable.lpWSHStringToAddress) = e; HelperDLL->EntryTable.lpWSHStringToAddress = e;
return NO_ERROR; return NO_ERROR;
} }