[myserver-commit] [SCM] GNU MyServer branch, master, updated. 770c3f305cd6ca376e3152a27aa91a3e2da67402

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  770c3f305cd6ca376e3152a27aa91a3e2da67402 (commit)
       via  6fc54137888b8edb68939dbe4e3a56bd076a1afe (commit)
      from  9b1f8b776b7cc4ceb446bf37c61d7434bd4f6b0c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 770c3f305cd6ca376e3152a27aa91a3e2da67402
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Oct 30 22:53:19 2009 +0100

    Use ClientsThread::busy as a bool not an int.

diff --git a/myserver/src/server/clients_thread.cpp 
b/myserver/src/server/clients_thread.cpp
index 5ce6b46..7cf0405 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -156,7 +156,7 @@ DEFINE_THREAD (clients_thread, pParam)
 
           ret = ct->controlConnections ();
           ct->server->increaseFreeThread ();
-          ct->busy = 0;
+          ct->busy = false;
 
           /*
            *The thread served the connection, so update the timeout value.
@@ -260,7 +260,7 @@ int ClientsThread::controlConnections ()
   if (!c)
     return 1;
 
-  busy = 1;
+  busy = true;
   dataRead = c->getConnectionBuffer ()->getLength ();
 
   err = c->socket->recv (&((char*)(buffer.getBuffer ()))[dataRead],



commit 6fc54137888b8edb68939dbe4e3a56bd076a1afe
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Oct 30 20:53:30 2009 +0100

    Simplify some functions.

diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index 9ab5de7..c973f7a 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -416,10 +416,7 @@ time_t File::getLastAccTime ()
  */
 int File::write (const char* buffer, u_long len, u_long *nbw)
 {
-  int ret = writeToFile (buffer, len, nbw );
-  if (ret != 0)
-    return -1;
-  return 0;
+  return writeToFile (buffer, len, nbw );
 }
 
 /*!
@@ -433,11 +430,10 @@ int File::write (const char* buffer, u_long len, u_long 
*nbw)
 int File::read (char* buffer, u_long buffersize, u_long* nbr)
 {
 #ifdef WIN32
-  int ret = ReadFile (handle, buffer, buffersize, nbr, NULL);
-  return (!ret);
+  return !ReadFile (handle, buffer, buffersize, nbr, NULL);
 #else
   int ret  = ::read (handle, buffer, buffersize);
-  *nbr = (u_long)ret;
+  *nbr = (u_long) ret;
   return (ret == -1);
 #endif
 }

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/base/file/file.cpp        |   10 +++-------
 myserver/src/server/clients_thread.cpp |    4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU MyServer