Fix GCC build breaks.

Fix case mismatch for includes of "Socket.h".  Original code was <socket.h> while file was Socket.h in the same directory as the .c file.
Add EFIAPI to function declarations so that they match the definition.
Remove "ineffective" statements from stub functions.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12076 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/StdLib/EfiSocketLib/Init.c b/StdLib/EfiSocketLib/Init.c
index 7a1b89da87a09c0a57331d49c745e02c0856631d..f444acc74267054f76f88fa538dca8b2fb793d33 100644 (file)
--- a/StdLib/EfiSocketLib/Init.c
+++ b/StdLib/EfiSocketLib/Init.c
@@ -5,14 +5,14 @@
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r

-  http://opensource.org/licenses/bsd-license.php\r
+  http://opensource.org/licenses/bsd-license.\r

 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r

-#include <socket.h>\r
+#include "Socket.h"\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r

diff --git a/StdLib/EfiSocketLib/UseEfiSocketLib.c b/StdLib/EfiSocketLib/UseEfiSocketLib.c
index b0e8ef671a2575eaff6452aaf01c3abfbfa38b03..a07b2b6e2253ae059d9e8dc941dd4acbdf415784 100644 (file)
--- a/StdLib/EfiSocketLib/UseEfiSocketLib.c
+++ b/StdLib/EfiSocketLib/UseEfiSocketLib.c
@@ -12,7 +12,7 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#include <socket.h>\r
+#include "Socket.h"\r

 \r
 \r
 CONST EFI_GUID mEslRawServiceGuid = {\r
 \r
 \r
 CONST EFI_GUID mEslRawServiceGuid = {\r

diff --git a/StdLib/Include/Efi/EfiSocketLib.h b/StdLib/Include/Efi/EfiSocketLib.h
index 53ad0d4003ef7897430152ff9a186a440f45ca91..f54d4c8fe3b1c9a662954d3d07a423b3c1149d45 100644 (file)
--- a/StdLib/Include/Efi/EfiSocketLib.h
+++ b/StdLib/Include/Efi/EfiSocketLib.h
@@ -112,13 +112,13 @@ typedef struct _DT_SERVICE DT_SERVICE;  ///<  Forward delcaration
 \r
 typedef\r
 EFI_STATUS\r
 \r
 typedef\r
 EFI_STATUS\r

-(* PFN_SB_INITIALIZE) (\r
+(EFIAPI * PFN_SB_INITIALIZE) (\r

     DT_SERVICE * pService\r
     );\r
 \r
 typedef\r
 VOID\r
     DT_SERVICE * pService\r
     );\r
 \r
 typedef\r
 VOID\r

-(* PFN_SB_SHUTDOWN) (\r
+(EFIAPI * PFN_SB_SHUTDOWN) (\r

     DT_SERVICE * pService\r
     );\r
 \r
     DT_SERVICE * pService\r
     );\r
 \r

diff --git a/StdLib/LibC/Uefi/StubFunctions.c b/StdLib/LibC/Uefi/StubFunctions.c
index da2eaf91487b754dbd9039a61507011a0854d745..1462c3ff38f301a3ce587a3281f6c48d73b0f08a 100644 (file)
--- a/StdLib/LibC/Uefi/StubFunctions.c
+++ b/StdLib/LibC/Uefi/StubFunctions.c
@@ -21,7 +21,6 @@
 struct passwd *\r
 getpwuid (uid_t uid)\r
 {\r
 struct passwd *\r
 getpwuid (uid_t uid)\r
 {\r

-  uid;\r

   errno = EPERM;\r
   return NULL;\r
 }\r
   errno = EPERM;\r
   return NULL;\r
 }\r


@@ -35,7 +34,6 @@ char *getlogin (void)
 struct passwd *\r
 getpwnam (const char *name)\r
 {\r
 struct passwd *\r
 getpwnam (const char *name)\r
 {\r

-  name;\r

   errno = EPERM;\r
   return NULL;\r
 }\r
   errno = EPERM;\r
   return NULL;\r
 }\r