Date: Friday, December 1, 2006 @ 14:56:24
Author: gilles
Path: /cvsroot/carob/carob
Modified: include/JavaSocket.hpp (1.34 -> 1.35) src/JavaSocket.cpp (1.57
-> 1.58)
Renamed socketFd field to socket_fd (trying to keep consistency in instance
variables naming)
------------------------+
include/JavaSocket.hpp | 6 +++---
src/JavaSocket.cpp | 22 +++++++++++-----------
2 files changed, 14 insertions(+), 14 deletions(-)
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.34 carob/include/JavaSocket.hpp:1.35
--- carob/include/JavaSocket.hpp:1.34 Wed Nov 29 20:29:00 2006
+++ carob/include/JavaSocket.hpp Fri Dec 1 14:56:24 2006
@@ -61,7 +61,7 @@
* @return true if the socket is valid (has been created) so it can be
* connected
*/
- inline bool isValid() const { return socketFd != -1; }
+ inline bool isValid() const { return socket_fd != -1; }
/**
* Gives connection status
* @return true if the socket is connected to a host
@@ -172,7 +172,7 @@
* Gets the socket file descriptor
* @return the file descriptor
*/
- int getFd() const { return socketFd; }
+ int getFd() const { return socket_fd; }
protected:
/**
* Substitute for recv. Loops/blocks until full length has been received.
@@ -212,7 +212,7 @@
private:
/** Socket file descriptor */
- int socketFd;
+ int socket_fd;
/** true if the socket is connected to a host */
bool connected;
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.57 carob/src/JavaSocket.cpp:1.58
--- carob/src/JavaSocket.cpp:1.57 Wed Nov 29 20:29:00 2006
+++ carob/src/JavaSocket.cpp Fri Dec 1 14:56:24 2006
@@ -40,7 +40,7 @@
using namespace CarobNS;
JavaSocket::JavaSocket() :
-socketFd(-1),
+socket_fd(-1),
connected(false)
{
}
@@ -67,9 +67,9 @@
wstring fctName(L"JavaSocket::Create");
if (isDebugEnabled())
logDebug(fctName, L"Creating socket...");
- socketFd = socket(domain, SOCK_STREAM, 0);
+ socket_fd = socket(domain, SOCK_STREAM, 0);
- if (socketFd == -1)
+ if (socket_fd == -1)
{
if (isErrorEnabled())
logError(fctName, L"Socket creation failed");
@@ -78,10 +78,10 @@
//Set socket options
int opt_value = 1;
- if (setsockopt(socketFd, IPPROTO_TCP, TCP_NODELAY,
+ if (setsockopt(socket_fd, IPPROTO_TCP, TCP_NODELAY,
reinterpret_cast<char*>(&opt_value), sizeof opt_value) == -1
#if (defined(__MACH__) && defined(__APPLE__)) // quick & dirty fix for MacOSX
- || setsockopt(socketFd, SOL_SOCKET, SO_NOSIGPIPE,
+ || setsockopt(socket_fd, SOL_SOCKET, SO_NOSIGPIPE,
reinterpret_cast<char*>(&opt_value), sizeof (opt_value) ==
-1)
#endif
)
@@ -111,7 +111,7 @@
addr = *(reinterpret_cast<struct sockaddr_in*>(ai->ai_addr));
addr.sin_port = htons(port);
- int resp = ::connect(socketFd, reinterpret_cast<sockaddr*>(&addr),
sizeof(addr));
+ int resp = ::connect(socket_fd, reinterpret_cast<sockaddr*>(&addr),
sizeof(addr));
if (resp==0)
{
connected = true;
@@ -126,9 +126,9 @@
if (isValid())
{
#ifdef __MINGW32__
- if (closesocket(socketFd) != 0)
+ if (closesocket(socket_fd) != 0)
#else
- if (close(socketFd) != 0)
+ if (close(socket_fd) != 0)
#endif
{
wstring msg(L"Could not close socket. Error code is ");
@@ -143,7 +143,7 @@
if (isDebugEnabled())
logDebug(fctName, L"Socket closed.");
}
- socketFd = -1;
+ socket_fd = -1;
connected = false;
return true;
}
@@ -279,7 +279,7 @@
int readThisTime = 0; //The size read at each receive
while (alreadyRead < len)
{
- readThisTime = recv(socketFd,
+ readThisTime = recv(socket_fd,
(char*)(static_cast<uint8_t*>(
((static_cast<uint8_t*>(buf))+alreadyRead))),
len-alreadyRead,
@@ -300,7 +300,7 @@
{
// in non blocking mode, send will block until len bytes are send. So no need
// to loop here
- int ret = send(socketFd, static_cast<const char*>(buf), len, flags);
+ int ret = send(socket_fd, static_cast<const char*>(buf), len, flags);
if ( ret == -1 )
{
throw SocketIOException(L'(' + fctName + L"): could not write "
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
