summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_NS_stropts.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-07-14 07:48:09 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-07-14 07:48:09 +0000
commite0ea065be3c76a012b943fa8bf08415bc2f4be2f (patch)
tree828fddbb1658e9fd9ee6dd015531060552157b0c /ACE/ace/OS_NS_stropts.cpp
parent78cd8ec7aaa4eda5b4f38328d48e874f9cf22b1d (diff)
downloadATCD-e0ea065be3c76a012b943fa8bf08415bc2f4be2f.tar.gz
Sat Jul 14 07:47:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/OS_NS_stropts.cpp')
-rw-r--r--ACE/ace/OS_NS_stropts.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/ACE/ace/OS_NS_stropts.cpp b/ACE/ace/OS_NS_stropts.cpp
index 6c46b27a77c..97855b388e9 100644
--- a/ACE/ace/OS_NS_stropts.cpp
+++ b/ACE/ace/OS_NS_stropts.cpp
@@ -100,31 +100,31 @@ ACE_OS::ioctl (ACE_HANDLE socket,
if (result == SOCKET_ERROR)
- {
- unsigned long dwErr = ::WSAGetLastError ();
-
- if (dwErr == WSAEWOULDBLOCK)
- {
- errno = dwErr;
- return -1;
- }
- else
- if (dwErr != WSAENOBUFS)
- {
- errno = dwErr;
- return -1;
- }
+ {
+ unsigned long dwErr = ::WSAGetLastError ();
+
+ if (dwErr == WSAEWOULDBLOCK)
+ {
+ errno = dwErr;
+ return -1;
+ }
+ else
+ if (dwErr != WSAENOBUFS)
+ {
+ errno = dwErr;
+ return -1;
+ }
}
- char *qos_buf;
- ACE_NEW_RETURN (qos_buf,
- char [dwBufferLen],
- -1);
+ char *qos_buf = 0;
+ ACE_NEW_RETURN (qos_buf,
+ char [dwBufferLen],
+ -1);
- QOS *qos = reinterpret_cast<QOS*> (qos_buf);
+ QOS *qos = reinterpret_cast<QOS*> (qos_buf);
- result = ::WSAIoctl ((ACE_SOCKET) socket,
- io_control_code,
+ result = ::WSAIoctl ((ACE_SOCKET) socket,
+ io_control_code,
NULL,
0,
qos,
@@ -134,7 +134,7 @@ ACE_OS::ioctl (ACE_HANDLE socket,
NULL);
if (result == SOCKET_ERROR)
- return result;
+ return result;
ACE_Flow_Spec sending_flowspec (qos->SendingFlowspec.TokenRate,
qos->SendingFlowspec.TokenBucketSize,