summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-08-23 18:56:12 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-08-23 18:56:12 +0000
commitb8751a6fdec0fd469a3a42aa057535a2b726c74d (patch)
tree6a7fd047a68d16ef18c516553873acf222c916e7
parent1cf629c4851baf7d5d5addc9b243396eeba2c888 (diff)
downloadATCD-b8751a6fdec0fd469a3a42aa057535a2b726c74d.tar.gz
ChangeLogTag: Tue Aug 23 18:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ace/Configuration.cpp6
-rw-r--r--ace/OS_NS_sys_socket.inl4
2 files changed, 6 insertions, 4 deletions
diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp
index 5bfe79819af..6d4b1901baf 100644
--- a/ace/Configuration.cpp
+++ b/ace/Configuration.cpp
@@ -357,7 +357,8 @@ ACE_Configuration::operator== (const ACE_Configuration& rhs) const
}
else if (valueType == INTEGER)
{
- u_int thisInt, rhsInt;
+ u_int thisInt = 0;
+ u_int rhsInt = 0;
if (nonconst_this->get_integer_value (
thisSection,
valueName.c_str (),
@@ -380,7 +381,8 @@ ACE_Configuration::operator== (const ACE_Configuration& rhs) const
{
void* thisData = 0;
void* rhsData = 0;
- size_t thisLength, rhsLength;
+ size_t thisLength = 0;
+ size_t rhsLength = 0;
if (nonconst_this->get_binary_value (thisSection,
valueName.c_str (),
thisData,
diff --git a/ace/OS_NS_sys_socket.inl b/ace/OS_NS_sys_socket.inl
index 10a32444697..fa6f3a30153 100644
--- a/ace/OS_NS_sys_socket.inl
+++ b/ace/OS_NS_sys_socket.inl
@@ -467,7 +467,7 @@ ACE_OS::recvmsg (ACE_HANDLE handle, struct msghdr *msg, int flags)
return -1;
}
else
- return (ssize_t) bytes_received;
+ return bytes_received;
# else /* ACE_HAS_WINSOCK2 */
ACE_SOCKCALL_RETURN (::recvmsg (handle, msg, flags), int, -1);
# endif /* ACE_HAS_WINSOCK2 */
@@ -609,7 +609,7 @@ ACE_OS::sendmsg (ACE_HANDLE handle,
return -1;
}
else
- return (ssize_t) bytes_sent;
+ return bytes_sent;
# elif defined (ACE_HAS_NONCONST_SENDMSG)
ACE_SOCKCALL_RETURN (::sendmsg (handle,
const_cast<struct msghdr *>(msg),