StdLib: Change the last argument of the ioctl helper functions to va_list* from void*.

Functions which call these helper functions always pass the last parameter as a va_list argument.
Add a conditional block around a MSFT-only pragma so that stringlist.c will compile with GCC.
Comment-out the Socket Library components within StdLib.dsc.  These components are still in development.

Signed-off-by: darylm503
Reviewed by:   geekboy15A

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

1 files changed, 3 insertions, 2 deletions

diff --git a/StdLibPrivateInternalFiles/Include/kfile.h b/StdLibPrivateInternalFiles/Include/kfile.h
index c83b07b1a8..6e7d1b4c79 100644
--- a/StdLibPrivateInternalFiles/Include/kfile.h
+++ b/StdLibPrivateInternalFiles/Include/kfile.h
@@ -48,6 +48,7 @@
 #include  <Protocol/SimpleFileSystem.h>

 

 #include  <wchar.h>

+#include  <stdarg.h>

 #include  <sys/fcntl.h>

 #include  <sys/unistd.h>

 

@@ -104,7 +105,7 @@ struct fileops {
 

   /* Call the fbadop_* version of these functions if not implemented by the device. */

   int     (EFIAPI *fo_stat)     (struct __filedes *filp, struct stat *StatBuf, void *Buf);

-  int     (EFIAPI *fo_ioctl)    (struct __filedes *filp, ULONGN Cmd, void *argp);

+  int     (EFIAPI *fo_ioctl)    (struct __filedes *filp, ULONGN Cmd, va_list argp);

   int     (EFIAPI *fo_delete)   (struct __filedes *filp);

   int     (EFIAPI *fo_rmdir)    (struct __filedes *filp);

   int     (EFIAPI *fo_mkdir)    (const char *path, __mode_t perms);

@@ -159,7 +160,7 @@ short   EFIAPI fnullop_poll  (struct __filedes *filp, short Events);
 int     EFIAPI fnullop_flush (struct __filedes *filp);

 

 int     EFIAPI fbadop_stat   (struct __filedes *filp, struct stat *StatBuf, void *Buf);

-int     EFIAPI fbadop_ioctl  (struct __filedes *filp, ULONGN Cmd, void *argp);

+int     EFIAPI fbadop_ioctl  (struct __filedes *filp, ULONGN Cmd, va_list argp);

 int     EFIAPI fbadop_delete (struct __filedes *filp);

 int     EFIAPI fbadop_rmdir  (struct __filedes *filp);

 int     EFIAPI fbadop_mkdir  (const char *path, __mode_t perms);