mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-13 10:52:56 +01:00
Problem: source code contains tabs
Solution: replace tabes with spaces
This commit is contained in:
parent
e8d665c4e5
commit
022cf2aeaa
10
src/ctx.cpp
10
src/ctx.cpp
@ -91,7 +91,7 @@ zmq::ctx_t::ctx_t () :
|
||||
vmci_family = -1;
|
||||
#endif
|
||||
|
||||
scoped_lock_t locker(crypto_sync);
|
||||
scoped_lock_t locker(crypto_sync);
|
||||
#if defined (ZMQ_USE_TWEETNACL)
|
||||
// allow opening of /dev/urandom
|
||||
unsigned char tmpbytes[4];
|
||||
@ -510,13 +510,13 @@ void zmq::ctx_t::pend_connection (const std::string &addr_,
|
||||
|
||||
endpoints_t::iterator it = endpoints.find (addr_);
|
||||
if (it == endpoints.end ()) {
|
||||
// Still no bind.
|
||||
// Still no bind.
|
||||
endpoint_.socket->inc_seqnum ();
|
||||
pending_connections.insert (pending_connections_t::value_type (addr_, pending_connection));
|
||||
} else {
|
||||
// Bind has happened in the mean time, connect directly
|
||||
connect_inproc_sockets(it->second.socket, it->second.options, pending_connection, connect_side);
|
||||
}
|
||||
// Bind has happened in the mean time, connect directly
|
||||
connect_inproc_sockets(it->second.socket, it->second.options, pending_connection, connect_side);
|
||||
}
|
||||
}
|
||||
|
||||
void zmq::ctx_t::connect_pending (const char *addr_, zmq::socket_base_t *bind_socket_)
|
||||
|
@ -53,7 +53,7 @@ zmq::dgram_t::~dgram_t ()
|
||||
|
||||
void zmq::dgram_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
|
||||
{
|
||||
LIBZMQ_UNUSED(subscribe_to_all_);
|
||||
LIBZMQ_UNUSED(subscribe_to_all_);
|
||||
|
||||
zmq_assert (pipe_);
|
||||
|
||||
|
@ -130,7 +130,7 @@ int zmq::get_peer_ip_address (fd_t sockfd_, std::string &ip_addr_)
|
||||
rc = getpeername (sockfd_, (struct sockaddr*) &ss, &addrlen);
|
||||
#ifdef ZMQ_HAVE_WINDOWS
|
||||
if (rc == SOCKET_ERROR) {
|
||||
const int last_error = WSAGetLastError();
|
||||
const int last_error = WSAGetLastError();
|
||||
wsa_assert (last_error != WSANOTINITIALISED &&
|
||||
last_error != WSAEFAULT &&
|
||||
last_error != WSAEINPROGRESS &&
|
||||
|
@ -390,12 +390,12 @@ void zmq::pipe_t::terminate (bool delay_)
|
||||
// If terminate was already called, we can ignore the duplicate invocation.
|
||||
if (state == term_req_sent1 || state == term_req_sent2) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
// If the pipe is in the final phase of async termination, it's going to
|
||||
// closed anyway. No need to do anything special here.
|
||||
else if (state == term_ack_sent) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
// The simple sync termination case. Ask the peer to terminate and wait
|
||||
// for the ack.
|
||||
else if (state == active) {
|
||||
@ -422,7 +422,7 @@ void zmq::pipe_t::terminate (bool delay_)
|
||||
// There are no other states.
|
||||
else {
|
||||
zmq_assert (false);
|
||||
}
|
||||
}
|
||||
|
||||
// Stop outbound flow of messages.
|
||||
out_active = false;
|
||||
|
@ -432,9 +432,9 @@ bool zmq::select_t::is_retired_fd (const fd_entry_t &entry)
|
||||
#if defined ZMQ_HAVE_WINDOWS
|
||||
u_short zmq::select_t::get_fd_family (fd_t fd_)
|
||||
{
|
||||
// Use sockaddr_storage instead of sockaddr to accomodate differect structure sizes
|
||||
sockaddr_storage addr = { 0 };
|
||||
int addr_size = sizeof addr;
|
||||
// Use sockaddr_storage instead of sockaddr to accomodate differect structure sizes
|
||||
sockaddr_storage addr = { 0 };
|
||||
int addr_size = sizeof addr;
|
||||
|
||||
int type;
|
||||
int type_length = sizeof(int);
|
||||
|
@ -338,11 +338,11 @@ int zmq::signaler_t::recv_failable ()
|
||||
#if defined ZMQ_HAVE_WINDOWS
|
||||
int nbytes = ::recv (r, (char *) &dummy, sizeof (dummy), 0);
|
||||
if (nbytes == SOCKET_ERROR) {
|
||||
const int last_error = WSAGetLastError();
|
||||
if (last_error == WSAEWOULDBLOCK) {
|
||||
errno = EAGAIN;
|
||||
const int last_error = WSAGetLastError();
|
||||
if (last_error == WSAEWOULDBLOCK) {
|
||||
errno = EAGAIN;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
wsa_assert (last_error == WSAEWOULDBLOCK);
|
||||
}
|
||||
#else
|
||||
@ -388,7 +388,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
|
||||
|
||||
#elif defined ZMQ_HAVE_WINDOWS
|
||||
# if !defined _WIN32_WCE
|
||||
// Windows CE does not manage security attributes
|
||||
// Windows CE does not manage security attributes
|
||||
SECURITY_DESCRIPTOR sd;
|
||||
SECURITY_ATTRIBUTES sa;
|
||||
memset (&sd, 0, sizeof sd);
|
||||
|
@ -432,7 +432,7 @@ int zmq::socket_base_t::getsockopt (int option_, void *optval_,
|
||||
return -1;
|
||||
}
|
||||
memset(optval_, 0, *optvallen_);
|
||||
*((int*) optval_) = thread_safe ? 1 : 0;
|
||||
*((int*) optval_) = thread_safe ? 1 : 0;
|
||||
*optvallen_ = sizeof (int);
|
||||
return 0;
|
||||
}
|
||||
|
@ -60,7 +60,7 @@ zmq::stream_t::~stream_t ()
|
||||
|
||||
void zmq::stream_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
|
||||
{
|
||||
LIBZMQ_UNUSED(subscribe_to_all_);
|
||||
LIBZMQ_UNUSED(subscribe_to_all_);
|
||||
|
||||
zmq_assert (pipe_);
|
||||
|
||||
|
16
src/tcp.cpp
16
src/tcp.cpp
@ -189,7 +189,7 @@ void zmq::tune_tcp_maxrt (fd_t sockfd_, int timeout_)
|
||||
|
||||
// If not a single byte can be written to the socket in non-blocking mode
|
||||
// we'll get an error (this may happen during the speculative write).
|
||||
const int last_error = WSAGetLastError();
|
||||
const int last_error = WSAGetLastError();
|
||||
if (nbytes == SOCKET_ERROR && last_error == WSAEWOULDBLOCK)
|
||||
return 0;
|
||||
|
||||
@ -201,7 +201,7 @@ void zmq::tune_tcp_maxrt (fd_t sockfd_, int timeout_)
|
||||
last_error == WSAECONNABORTED ||
|
||||
last_error == WSAETIMEDOUT ||
|
||||
last_error == WSAECONNRESET
|
||||
))
|
||||
))
|
||||
return -1;
|
||||
|
||||
// Circumvent a Windows bug:
|
||||
@ -256,12 +256,12 @@ int zmq::tcp_read (fd_t s_, void *data_, size_t size_)
|
||||
errno = EAGAIN;
|
||||
}
|
||||
else {
|
||||
wsa_assert (last_error == WSAENETDOWN ||
|
||||
last_error == WSAENETRESET ||
|
||||
last_error == WSAECONNABORTED ||
|
||||
last_error == WSAETIMEDOUT ||
|
||||
last_error == WSAECONNRESET ||
|
||||
last_error == WSAECONNREFUSED ||
|
||||
wsa_assert (last_error == WSAENETDOWN ||
|
||||
last_error == WSAENETRESET ||
|
||||
last_error == WSAECONNABORTED ||
|
||||
last_error == WSAETIMEDOUT ||
|
||||
last_error == WSAECONNRESET ||
|
||||
last_error == WSAECONNREFUSED ||
|
||||
last_error == WSAENOTCONN);
|
||||
errno = wsa_error_to_errno (last_error);
|
||||
}
|
||||
|
@ -281,7 +281,7 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
|
||||
|
||||
#ifdef ZMQ_HAVE_WINDOWS
|
||||
if (sock == INVALID_SOCKET) {
|
||||
const int last_error = WSAGetLastError();
|
||||
const int last_error = WSAGetLastError();
|
||||
wsa_assert (last_error == WSAEWOULDBLOCK ||
|
||||
last_error == WSAECONNRESET ||
|
||||
last_error == WSAEMFILE ||
|
||||
|
@ -573,8 +573,8 @@ int crypto_hashblocks(u8 *x,const u8 *m,u64 n)
|
||||
b[3] += t;
|
||||
FOR(j,8) a[(j+1)%8] = b[j];
|
||||
if (i%16 == 15)
|
||||
FOR(j,16)
|
||||
w[j] += w[(j+9)%16] + sigma0(w[(j+1)%16]) + sigma1(w[(j+14)%16]);
|
||||
FOR(j,16)
|
||||
w[j] += w[(j+9)%16] + sigma0(w[(j+1)%16]) + sigma1(w[(j+14)%16]);
|
||||
}
|
||||
|
||||
FOR(i,8) { a[i] += z[i]; z[i] = a[i]; }
|
||||
|
Loading…
Reference in New Issue
Block a user