summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-08-31 14:10:11 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-08-31 14:10:11 +0000
commit871445a9b08af982918f11f5b83746b3fbc20e7c (patch)
tree4b231f85d9a451a62cada64f68df2ff41efe39a3
parent28e9dc7bb76cf8fa5ac31d8b9bbbee10c7176ea7 (diff)
downloadATCD-871445a9b08af982918f11f5b83746b3fbc20e7c.tar.gz
ChangeLogTag: Wed Aug 31 13:12:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>Wed Aug 31 13:52:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ace/Framework_Component.cpp2
-rw-r--r--ace/MEM_Stream.h8
-rw-r--r--ace/MEM_Stream.inl8
-rw-r--r--ace/OS_NS_sys_msg.h10
-rw-r--r--ace/OS_NS_sys_msg.inl2
5 files changed, 15 insertions, 15 deletions
diff --git a/ace/Framework_Component.cpp b/ace/Framework_Component.cpp
index 774dc30376e..6b035cc922e 100644
--- a/ace/Framework_Component.cpp
+++ b/ace/Framework_Component.cpp
@@ -43,7 +43,7 @@ ACE_Framework_Repository::open (int size)
{
ACE_TRACE ("ACE_Framework_Repository::open");
- ACE_Framework_Component **temp;
+ ACE_Framework_Component **temp = 0;
ACE_NEW_RETURN (temp,
ACE_Framework_Component *[size],
diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h
index a469a2caeb9..41c41746242 100644
--- a/ace/MEM_Stream.h
+++ b/ace/MEM_Stream.h
@@ -68,14 +68,14 @@ public:
//= The following two methods use write and read system calls.
/// Send n bytes, keep trying until n are sent.
/// Recv n bytes, keep trying until n are received.
- ssize_t send_n (const void *buf, int n);
- ssize_t recv_n (void *buf, int n);
+ ssize_t send_n (const void *buf, size_t n);
+ ssize_t recv_n (void *buf, size_t n);
// = The following two methods use the send and recv system calls.
/// Send n bytes, keep trying until n are sent.
/// Recv n bytes, keep trying until n are received.
- ssize_t send_n (const void *buf, int n, int flags);
- ssize_t recv_n (void *buf, int n, int flags);
+ ssize_t send_n (const void *buf, size_t n, int flags);
+ ssize_t recv_n (void *buf, size_t n, int flags);
#if 0
/**
diff --git a/ace/MEM_Stream.inl b/ace/MEM_Stream.inl
index b92d4c7471f..df33caaf630 100644
--- a/ace/MEM_Stream.inl
+++ b/ace/MEM_Stream.inl
@@ -46,26 +46,26 @@ ACE_MEM_Stream::close_writer (void)
}
ACE_INLINE ssize_t
-ACE_MEM_Stream::send_n (const void *buf, int n)
+ACE_MEM_Stream::send_n (const void *buf, size_t n)
{
return this->send (buf, n);
}
ACE_INLINE ssize_t
-ACE_MEM_Stream::recv_n (void *buf, int n)
+ACE_MEM_Stream::recv_n (void *buf, size_t n)
{
return this->recv (buf, n);
}
ACE_INLINE ssize_t
-ACE_MEM_Stream::send_n (const void *buf, int n, int flags)
+ACE_MEM_Stream::send_n (const void *buf, size_t n, int flags)
{
return this->send (buf, n, flags);
}
ACE_INLINE ssize_t
-ACE_MEM_Stream::recv_n (void *buf, int n, int flags)
+ACE_MEM_Stream::recv_n (void *buf, size_t n, int flags)
{
return this->recv (buf, n, flags);
}
diff --git a/ace/OS_NS_sys_msg.h b/ace/OS_NS_sys_msg.h
index ad6bd2493b0..37b4743d43b 100644
--- a/ace/OS_NS_sys_msg.h
+++ b/ace/OS_NS_sys_msg.h
@@ -46,11 +46,11 @@ namespace ACE_OS {
int msgflg);
ACE_NAMESPACE_INLINE_FUNCTION
- int msgrcv (int int_id,
- void *buf,
- size_t len,
- long type,
- int flags);
+ ssize_t msgrcv (int int_id,
+ void *buf,
+ size_t len,
+ long type,
+ int flags);
ACE_NAMESPACE_INLINE_FUNCTION
int msgsnd (int int_id,
diff --git a/ace/OS_NS_sys_msg.inl b/ace/OS_NS_sys_msg.inl
index 364eb57209e..7f71a4a75cc 100644
--- a/ace/OS_NS_sys_msg.inl
+++ b/ace/OS_NS_sys_msg.inl
@@ -32,7 +32,7 @@ ACE_OS::msgget (key_t key, int msgflg)
#endif /* ACE_HAS_SYSV_IPC */
}
-ACE_INLINE int
+ACE_INLINE ssize_t
ACE_OS::msgrcv (int int_id, void *buf, size_t len,
long type, int flags)
{