[myserver-commit] [3059] Removed readFd/writeFd helper functions from `ForkServer'.

[Giuseppe Scrivano]

Revision: 3059
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3059
Author:   gscrivano
Date:     2009-04-27 22:02:32 +0000 (Mon, 27 Apr 2009)
Log Message:
-----------
Removed readFd/writeFd helper functions from `ForkServer'.

Modified Paths:
--------------
    trunk/myserver/include/base/process/fork_server.h
    trunk/myserver/src/base/process/fork_server.cpp

Modified: trunk/myserver/include/base/process/fork_server.h
===================================================================
--- trunk/myserver/include/base/process/fork_server.h   2009-04-27 21:32:56 UTC 
(rev 3058)
+++ trunk/myserver/include/base/process/fork_server.h   2009-04-27 22:02:32 UTC 
(rev 3059)
@@ -45,9 +45,6 @@
   int readInt (SocketPair *sock, int *dest);
   int readString (SocketPair *sock, char **out);
 
-  int writeFd (SocketPair *socket, FileHandle fd);
-  int readFd (SocketPair *sock, FileHandle *fd);
-
   int handleRequest (SocketPair *serverSock);
   int forkServerLoop (SocketPair *socket);
 

Modified: trunk/myserver/src/base/process/fork_server.cpp
===================================================================
--- trunk/myserver/src/base/process/fork_server.cpp     2009-04-27 21:32:56 UTC 
(rev 3058)
+++ trunk/myserver/src/base/process/fork_server.cpp     2009-04-27 22:02:32 UTC 
(rev 3059)
@@ -26,28 +26,26 @@
 #endif
 
 /*!
- *Read a file descriptor from the specified socket.
- *\param socket Socket to use.
- *\param fd File handle to write.
+ *Write a string to the socket.
+ *The string length is sent before the content.
+ *
+ *\param socket Socket where write.
+ *\param str string to write.
+ *\param len string length.
  */
-int ForkServer::writeFd (SocketPair *socket, FileHandle fd)
+int ForkServer::writeString (SocketPair *socket, const char* str, int len)
 {
-  if (socket->writeHandle (fd))
-    return 1;
+  u_long nbw;
 
-  return 0;
-}
+  if (str == NULL)
+    len = 0;
 
-/*!
- *Write a file descriptor on the specified socket.
- *\param socket Socket to use.
- *\param fd Pointer to the file handle that is read.
- */
-int ForkServer::readFd (SocketPair *socket, FileHandle *fd)
-{
-  if (socket->readHandle (fd))
+  if (socket->write ((const char*)&len, 4, &nbw))
     return 1;
 
+  if (len && socket->write (str, len, &nbw))
+    return 1;
+
   return 0;
 }
 
@@ -66,30 +64,7 @@
   return 0;
 }
 
-/*!
- *Write a string to the socket.
- *The string length is sent before the content.
- *
- *\param socket Socket where write.
- *\param str string to write.
- *\param len string length.
- */
-int ForkServer::writeString (SocketPair *socket, const char* str, int len)
-{
-  u_long nbw;
 
-  if (str == NULL)
-    len = 0;
-
-  if (socket->write ((const char*)&len, 4, &nbw))
-    return 1;
-
-  if (len && socket->write (str, len, &nbw))
-    return 1;
-
-  return 0;
-}
-
 /*!
  *Read an integer from the socket.
  *
@@ -157,14 +132,14 @@
   readInt (serverSock, &flags);
 
   if (flags & FLAG_USE_IN)
-    readFd (serverSock, &stdIn);
+    serverSock->readHandle (&stdIn);
 
   if (flags & FLAG_USE_OUT)
-    readFd (serverSock, &stdOut);
+    serverSock->readHandle (&stdOut);
   
   if (flags & FLAG_USE_ERR)
-    readFd (serverSock, &stdErr);
-
+    serverSock->readHandle (&stdErr);
+  
   readInt (serverSock, &gid);
   readInt (serverSock, &uid);
 
@@ -319,13 +294,13 @@
       writeInt (&socket, flags);
       
       if (flags & FLAG_USE_IN)
-        writeFd (&socket, spi->stdIn);
+        socket.writeHandle (spi->stdIn);
       
       if (flags & FLAG_USE_OUT)
-        writeFd (&socket, spi->stdOut);
+        socket.writeHandle (spi->stdOut);
       
       if (flags & FLAG_USE_ERR)
-        writeFd (&socket, spi->stdError);
+        socket.writeHandle (spi->stdError);
       
       writeInt (&socket, spi->gid);
       writeInt (&socket, spi->uid);