[myserver-commit] [SCM] GNU MyServer branch, master, updated. 8041cc793b460b38569e16fb9d7050813ac62f3c

[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  8041cc793b460b38569e16fb9d7050813ac62f3c (commit)
      from  08f149e93fcb2d2bae81fb4712da05be889ca0ac (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 8041cc793b460b38569e16fb9d7050813ac62f3c
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Oct 1 20:20:39 2009 +0200

    Remove unneeded cast.

diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index b5b59ad..27bbb53 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -179,9 +179,9 @@ int File::openFile (const char* nfilename,u_long opt)
   if (attributeFlag == 0)
     attributeFlag = FILE_ATTRIBUTE_NORMAL;
 
-  handle = CreateFile(filename.c_str (), openFlag,
-                      FILE_SHARE_READ|FILE_SHARE_WRITE,
-                      &sa, creationFlag, attributeFlag, NULL);
+  handle = CreateFile (filename.c_str (), openFlag,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE,
+                       &sa, creationFlag, attributeFlag, NULL);
 
   if (handle == INVALID_HANDLE_VALUE)
     {
@@ -240,9 +240,9 @@ int File::openFile (const char* nfilename,u_long opt)
 }
 
 /*!
- *Returns the base/file/file.handle.
+ *Returns the file handle.
  */
-Handle File::getHandle()
+Handle File::getHandle ()
 {
   return (Handle) handle;
 }
@@ -305,7 +305,7 @@ int File::createTemporaryFile(const char* filename)
 }
 
 /*!
- *Close an open base/file/file.handle.
+ * Close the file.
  */
 int File::close()
 {
@@ -326,24 +326,21 @@ int File::close()
 }
 
 /*!
- *Returns the file size in bytes.
- *Returns -1 on errors.
+ * Returns the file size in bytes.
+ * Returns -1 on errors.
  */
 u_long File::getFileSize()
 {
   u_long ret;
 #ifdef WIN32
-  ret = GetFileSize(handle, NULL);
+  ret = GetFileSize (handle, NULL);
   if (ret != INVALID_FILE_SIZE)
-  {
     return ret;
-  }
   else
     return (u_long)-1;
 #else
   struct stat fStats;
   ret = fstat (handle, &fStats);
-
   if (ret)
     return (u_long)(-1);
   else
@@ -427,12 +424,12 @@ 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)handle, buffer, buffersize, nbr, NULL);
+  int ret = ReadFile (handle, buffer, buffersize, nbr, NULL);
   return (!ret);
 #else
-  int ret  = ::read((long)handle, buffer, buffersize);
+  int ret  = ::read (handle, buffer, buffersize);
   *nbr = (u_long)ret;
-  return (ret == -1) ;
+  return (ret == -1);
 #endif
 }
 
@@ -455,7 +452,6 @@ int File::fastCopyToSocket (Socket *dest, u_long firstByte, 
MemBuf *buf, u_long
     {
       int ret = sendfile (dest->getHandle (), getHandle (), &offset,
                           fileSize - offset);
-
       if (ret < 0)
         {
           /* Rollback to read/write on EINVAL or ENOSYS.  */

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

Summary of changes:
 myserver/src/base/file/file.cpp |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GNU MyServer