[myserver-commit] [3036] `Socket::write' returns -1 on errors as `Socket::read' already does.

[Giuseppe Scrivano]

Revision: 3036
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3036
Author:   gscrivano
Date:     2009-03-29 09:27:44 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
`Socket::write' returns -1 on errors as `Socket::read' already does.  Patch 
provided by Ivaylo Ilionov.

Modified Paths:
--------------
    trunk/myserver/src/base/socket/socket.cpp

Modified: trunk/myserver/src/base/socket/socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/socket.cpp   2009-03-28 13:42:56 UTC (rev 
3035)
+++ trunk/myserver/src/base/socket/socket.cpp   2009-03-29 09:27:44 UTC (rev 
3036)
@@ -780,7 +780,7 @@
 
 /*!
  *Inherited from Stream.
- *Return zero on success.
+ *Return zero on success, or -1 error. Also sets nbr to -1 if error.
  */
 int Socket::read(char* buffer, u_long len, u_long *nbr)
 {
@@ -794,16 +794,14 @@
 
 /*!
  *Inherited from Stream.
- *Return values are equals to send.
+ *Return zero on success, or -1 on error. Also sets nbw to -1 if error.
  */
 int Socket::write(const char* buffer, u_long len, u_long *nbw)
 {
-  int ret = send(buffer, len, 0);
+  *nbw = static_cast<u_long>(send(buffer, len, 0));
 
-  if(ret == -1)
+  if ( *nbw == static_cast<u_long>(-1) )
     return -1;
 
-  *nbw = static_cast<u_long>(ret);
-
   return 0;
 }