Avoid warnings when using gcc 3.4

svn path=/trunk/; revision=9343

diff --git a/reactos/lib/crtdll/stdio/fflush.c b/reactos/lib/crtdll/stdio/fflush.c
index 4253114..83852e6 100644 (file)
--- a/reactos/lib/crtdll/stdio/fflush.c
+++ b/reactos/lib/crtdll/stdio/fflush.c
@@ -36,7 +36,7 @@ int fflush(FILE *f)
 
      __set_errno(0);
     _fwalk((void (*)(FILE *))fflush);
-    if (_errno)
+    if (*_errno())
       return EOF;
     __set_errno(e);
     return 0;

diff --git a/reactos/lib/crtdll/stdio/getc.c b/reactos/lib/crtdll/stdio/getc.c
index 4f7a408..4816107 100644 (file)
--- a/reactos/lib/crtdll/stdio/getc.c
+++ b/reactos/lib/crtdll/stdio/getc.c
@@ -40,19 +40,20 @@ int getc(FILE *fp)
 
 wint_t  getwc(FILE *fp)
 {
+  wint_t c;
        
  // might check on multi bytes if text mode
  
   if(fp->_cnt > 0) {
         fp->_cnt -= sizeof(wchar_t);
-        return (wint_t )*((wchar_t *)(fp->_ptr))++;
+        c = *((wchar_t *)(fp->_ptr));
+        fp->_ptr += sizeof(wchar_t);
   } 
   else {
-       return _filwbuf(fp);
+       c = _filwbuf(fp);
   }
   
-  // never reached
-  return -1;
+  return c;
 }
 
 

diff --git a/reactos/lib/crtdll/stdio/putc.c b/reactos/lib/crtdll/stdio/putc.c
index e8b40cb..f471f3a 100644 (file)
--- a/reactos/lib/crtdll/stdio/putc.c
+++ b/reactos/lib/crtdll/stdio/putc.c
@@ -46,7 +46,8 @@ int putwc(wint_t c, FILE* fp)
  
         if (fp->_cnt > 0 ) {
                 fp->_cnt-= sizeof(wchar_t);
-               *((wchar_t *)(fp->_ptr))++  = c;
+               *((wchar_t *)(fp->_ptr))  = c;
+                fp->_ptr += sizeof(wchar_t);
                return (wint_t)c;
         }
         else

diff --git a/reactos/lib/msafd/misc/helpers.c b/reactos/lib/msafd/misc/helpers.c
index 93b5bf7..3760e87 100644 (file)
--- a/reactos/lib/msafd/misc/helpers.c
+++ b/reactos/lib/msafd/misc/helpers.c
@@ -108,35 +108,35 @@ INT GetHelperDLLEntries(
   /* The following functions MUST be supported */    
     e = GetProcAddress(HelperDLL->hModule, "WSHEnumProtocols");
     if (!e) return ERROR_BAD_PROVIDER;
-  ((PVOID) HelperDLL->EntryTable.lpWSHEnumProtocols) = e;
+  HelperDLL->EntryTable.lpWSHEnumProtocols = e;
 
   e = GetProcAddress(HelperDLL->hModule, "WSHGetSockaddrType");
     if (!e) return ERROR_BAD_PROVIDER;
-  ((PVOID) HelperDLL->EntryTable.lpWSHGetSockaddrType) = e;
+  HelperDLL->EntryTable.lpWSHGetSockaddrType = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHGetSocketInformation");
     if (!e) return ERROR_BAD_PROVIDER;
-  ((PVOID) HelperDLL->EntryTable.lpWSHGetSocketInformation) = e;
+  HelperDLL->EntryTable.lpWSHGetSocketInformation = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHGetWildcardSockaddr");
     if (!e) return ERROR_BAD_PROVIDER;
-  ((PVOID) HelperDLL->EntryTable.lpWSHGetWildcardSockaddr) = e;
+  HelperDLL->EntryTable.lpWSHGetWildcardSockaddr = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHGetWinsockMapping");
     if (!e) return ERROR_BAD_PROVIDER;
-  ((PVOID) HelperDLL->EntryTable.lpWSHGetWinsockMapping) = e;
+  HelperDLL->EntryTable.lpWSHGetWinsockMapping = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHNotify");
     if (!e) return ERROR_BAD_PROVIDER;
-  ((PVOID) HelperDLL->EntryTable.lpWSHNotify) = e;
+  HelperDLL->EntryTable.lpWSHNotify = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHOpenSocket");
     if (!e) return ERROR_BAD_PROVIDER;
-  ((PVOID) HelperDLL->EntryTable.lpWSHOpenSocket) = e;
+  HelperDLL->EntryTable.lpWSHOpenSocket = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHSetSocketInformation");
     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.
   */
     e = GetProcAddress(HelperDLL->hModule, "WSHAddressToString");
-  ((PVOID) HelperDLL->EntryTable.lpWSHAddressToString) = e;
+  HelperDLL->EntryTable.lpWSHAddressToString = e;
   
     e = GetProcAddress(HelperDLL->hModule, "WSHGetBroadcastSockaddr");
-       ((PVOID) HelperDLL->EntryTable.lpWSHGetBroadcastSockaddr) = e;
+       HelperDLL->EntryTable.lpWSHGetBroadcastSockaddr = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHGetProviderGuid");
-       ((PVOID) HelperDLL->EntryTable.lpWSHGetProviderGuid) = e;
+       HelperDLL->EntryTable.lpWSHGetProviderGuid = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHGetWSAProtocolInfo");
-       ((PVOID) HelperDLL->EntryTable.lpWSHGetWSAProtocolInfo) = e;
+       HelperDLL->EntryTable.lpWSHGetWSAProtocolInfo = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHIoctl");
-       ((PVOID) HelperDLL->EntryTable.lpWSHIoctl) = e;
+       HelperDLL->EntryTable.lpWSHIoctl = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHJoinLeaf");
-       ((PVOID) HelperDLL->EntryTable.lpWSHJoinLeaf) = e;
+       HelperDLL->EntryTable.lpWSHJoinLeaf = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHOpenSocket2");
-       ((PVOID) HelperDLL->EntryTable.lpWSHOpenSocket2) = e;
+       HelperDLL->EntryTable.lpWSHOpenSocket2 = e;
 
     e = GetProcAddress(HelperDLL->hModule, "WSHStringToAddress");
-       ((PVOID) HelperDLL->EntryTable.lpWSHStringToAddress) = e;
+       HelperDLL->EntryTable.lpWSHStringToAddress = e;
 
     return NO_ERROR;
 }