summaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorsletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2012-01-17 14:16:09 +0000
committersletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2012-01-17 14:16:09 +0000
commit5d7fbdc06671aa0116719e135cf1758cfc1a783e (patch)
tree43e1932bd04b7aa37be4fca32a0c8bccd7f96026 /posix
parentf59d570665cea668daaab4ad6b324a1a89b5b060 (diff)
downloadjack2-5d7fbdc06671aa0116719e135cf1758cfc1a783e.tar.gz
Cleanup.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4701 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'posix')
-rw-r--r--posix/JackSocket.cpp4
-rw-r--r--posix/JackSocketServerChannel.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/posix/JackSocket.cpp b/posix/JackSocket.cpp
index 0486ae67..6d05ab5c 100644
--- a/posix/JackSocket.cpp
+++ b/posix/JackSocket.cpp
@@ -120,7 +120,7 @@ int JackClientSocket::Connect(const char* dir, const char* name, int which) // A
addr.sun_family = AF_UNIX;
BuildName(name, addr.sun_path, dir, which);
- jack_log("Connect: addr.sun_path %s", addr.sun_path);
+ jack_log("JackClientSocket::Connect : addr.sun_path %s", addr.sun_path);
if (connect(fSocket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
jack_error("Cannot connect to server socket err = %s", strerror(errno));
@@ -254,7 +254,7 @@ int JackServerSocket::Bind(const char* dir, const char* name, int which) // A re
BuildName(name, fName, dir, which);
strncpy(addr.sun_path, fName, sizeof(addr.sun_path) - 1);
- jack_log("Bind: addr.sun_path %s", addr.sun_path);
+ jack_log("JackServerSocket::Bind : addr.sun_path %s", addr.sun_path);
unlink(fName); // Security...
if (bind(fSocket, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
diff --git a/posix/JackSocketServerChannel.cpp b/posix/JackSocketServerChannel.cpp
index dd65bf93..3eb17d91 100644
--- a/posix/JackSocketServerChannel.cpp
+++ b/posix/JackSocketServerChannel.cpp
@@ -116,7 +116,7 @@ int JackSocketServerChannel::GetFd(JackClientSocket* socket_aux)
{
std::map<int, std::pair<int, JackClientSocket*> >::iterator it;
- for (it = fSocketTable.begin(); it != fSocketTable.end(); it++) {
+ for (it = fSocketTable.begin(); it != fSocketTable.end(); it++) {
pair<int, JackClientSocket*> elem = (*it).second;
JackClientSocket* socket = elem.second;
if (socket_aux == socket) {
@@ -141,7 +141,7 @@ void JackSocketServerChannel::ClientAdd(detail::JackChannelTransactionInterface*
#ifdef __APPLE__
int on = 1;
if (setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&on, sizeof(on)) < 0) {
- jack_log("JackSocketServerChannel::ClientAdd : setsockopt SO_NOSIGPIPE fd = %ld err = %s", fd, strerror(errno));
+ jack_log("JackSocketServerChannel::ClientAdd : setsockopt SO_NOSIGPIPE fd = %ld err = %s", fd, strerror(errno));
}
#endif
} else {