ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Restructure and simplify debugstr_wsaioctl a bit.

This commit is contained in:
Gerald Pfeifer 2011-01-08 16:47:59 +01:00 committed by Alexandre Julliard
parent f133222d5e
commit 37f5080e1b
1 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/ws2_32/socket.c
View File

@ -2967,14 +2967,24 @@ char* WINAPI WS_inet_ntoa(struct WS_in_addr in)
static const char *debugstr_wsaioctl(DWORD ioctl) static const char *debugstr_wsaioctl(DWORD ioctl)
{ {
const char *buf_type, *family;
switch(ioctl & 0x18000000) switch(ioctl & 0x18000000)
{ {
case WS_IOC_UNIX: case WS_IOC_WS2:
family = "IOC_WS2";
break;
case WS_IOC_PROTOCOL:
family = "IOC_PROTOCOL";
break;
case WS_IOC_VENDOR:
family = "IOC_VENDOR";
break;
default: /* WS_IOC_UNIX */
{ {
BYTE size = (ioctl >> 16) & WS_IOCPARM_MASK; BYTE size = (ioctl >> 16) & WS_IOCPARM_MASK;
char x = (ioctl & 0xff00) >> 8; char x = (ioctl & 0xff00) >> 8;
BYTE y = ioctl & 0xff; BYTE y = ioctl & 0xff;
const char *buf_type;
char args[14]; char args[14];
switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT))
@ -2998,26 +3008,9 @@ static const char *debugstr_wsaioctl(DWORD ioctl)
} }
return wine_dbg_sprintf("%s(%s)", buf_type, args); return wine_dbg_sprintf("%s(%s)", buf_type, args);
} }
default:
{
USHORT code = ioctl & 0xffff;
const char *family, *buf_type;
/* This switch looks redundant, but isn't: the case WS_IOC_UNIX
* is handled differently than all others.
*/
switch(ioctl & 0x18000000)
{
case WS_IOC_WS2:
family = "IOC_WS2";
break;
case WS_IOC_PROTOCOL:
family = "IOC_PROTOCOL";
break;
case WS_IOC_VENDOR:
family = "IOC_VENDOR";
break;
} }
/* We are different from WS_IOC_UNIX. */
switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT))
{ {
case WS_IOC_VOID: case WS_IOC_VOID:
@ -3036,9 +3029,9 @@ static const char *debugstr_wsaioctl(DWORD ioctl)
buf_type = "?"; buf_type = "?";
break; break;
} }
return wine_dbg_sprintf("%s(%s, %d)", buf_type, family, code);
} return wine_dbg_sprintf("%s(%s, %d)", buf_type, family,
} (USHORT)(ioctl & 0xffff));
} }
/********************************************************************** /**********************************************************************