Fri Jan 22 15:44:01 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Log_Msg.h:
          Only define the ACE_DEBUG/ACE_ERROR* when they are not defined
          yet when ACE_NLOGGING is defined. This makes it possible for
          users to globally disable logging but then just enable ACE_ERROR

        * ace/Message_Block.cpp:
          Code layout changes

        * ace/SOCK_IO.cpp:
        * ace/SOCK_Dgram.cpp:
        * ace/Select_Reactor_T.cpp:
          Just define select_width twice and directly assign it

        * ace/OS_NS_sys_socket.inl:
          Move local variables into the loop

        * ace/config-sunos5.9.h:
        * ace/config-linux-common.h:
          Define ACE_HAS_SENDFILE to 1

1 files changed, 3 insertions, 6 deletions

diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl
index 041f9a2da23..3b84c06a5d2 100644
--- a/ACE/ace/OS_NS_sys_socket.inl
+++ b/ACE/ace/OS_NS_sys_socket.inl
@@ -520,15 +520,12 @@ ACE_OS::recvv (ACE_HANDLE handle,
                       0,
                       0);
 # else
-  int i, chunklen;
-  char *chunkp = 0;
-
   // Step through the buffers requested by caller; for each one, cycle
   // through reads until it's filled or an error occurs.
-  for (i = 0; i < n && result > 0; ++i)
+  for (int i = 0; i < n && result > 0; ++i)
     {
-      chunkp = buffers[i].iov_base;     // Point to part of chunk being read
-      chunklen = buffers[i].iov_len;    // Track how much to read to chunk
+      char *chunkp = buffers[i].iov_base;     // Point to part of chunk being read
+      int chunklen = buffers[i].iov_len;    // Track how much to read to chunk
       while (chunklen > 0 && result > 0)
         {
           result = ::recv ((SOCKET) handle, chunkp, chunklen, 0);