summaryrefslogtreecommitdiffstats
path: root/src/socket
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-02-23 20:07:09 +0000
committerDavid Robillard <d@drobilla.net>2013-02-23 20:07:09 +0000
commitdfad81a3c8aee40a515f0ecefb0180a86368b54a (patch)
tree0ddf00406358c4febaf18fed32e97cdd9c2f956c /src/socket
parent6b6cb56b2ceab509569bfca247f108f2be5e25c0 (diff)
downloadingen-dfad81a3c8aee40a515f0ecefb0180a86368b54a.tar.gz
ingen-dfad81a3c8aee40a515f0ecefb0180a86368b54a.tar.bz2
ingen-dfad81a3c8aee40a515f0ecefb0180a86368b54a.zip
Remove Raul::fmt wrapper, the last vestige of boost dependency for Raul.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5077 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/socket')
-rw-r--r--src/socket/SocketReader.cpp4
-rw-r--r--src/socket/ingen_socket_client.cpp2
-rw-r--r--src/socket/ingen_socket_server.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/socket/SocketReader.cpp b/src/socket/SocketReader.cpp
index d3e6affc..458032c5 100644
--- a/src/socket/SocketReader.cpp
+++ b/src/socket/SocketReader.cpp
@@ -94,7 +94,7 @@ SocketReader::run()
// Open socket as a FILE for reading directly with serd
FILE* f = fdopen(_socket->fd(), "r");
if (!f) {
- _world.log().error(Raul::fmt("Failed to open connection (%1%)\n")
+ _world.log().error(fmt("Failed to open connection (%1%)\n")
% strerror(errno));
// Connection gone, exit
_socket.reset();
@@ -159,7 +159,7 @@ SocketReader::run()
if (st == SERD_FAILURE || !_msg_node) {
continue; // Read nothing, e.g. just whitespace
} else if (st) {
- _world.log().error(Raul::fmt("Read error: %1%\n")
+ _world.log().error(fmt("Read error: %1%\n")
% serd_strerror(st));
continue;
}
diff --git a/src/socket/ingen_socket_client.cpp b/src/socket/ingen_socket_client.cpp
index a6b2f63b..4dd8a491 100644
--- a/src/socket/ingen_socket_client.cpp
+++ b/src/socket/ingen_socket_client.cpp
@@ -33,7 +33,7 @@ new_socket_interface(Ingen::World* world,
{
SPtr<Socket> sock(new Socket(Socket::type_from_uri(uri)));
if (!sock->connect(uri)) {
- world->log().error(Raul::fmt("Failed to connect <%1%> (%2%)\n")
+ world->log().error(fmt("Failed to connect <%1%> (%2%)\n")
% sock->uri() % strerror(errno));
return SPtr<Interface>();
}
diff --git a/src/socket/ingen_socket_server.cpp b/src/socket/ingen_socket_server.cpp
index 0a9d7494..e4f14249 100644
--- a/src/socket/ingen_socket_server.cpp
+++ b/src/socket/ingen_socket_server.cpp
@@ -49,7 +49,7 @@ ingen_listen(Ingen::World* world, Socket* unix_sock, Socket* net_sock)
world->log().error("Failed to create UNIX socket\n");
unix_sock->close();
}
- world->log().info(Raul::fmt("Listening on socket %1%\n") % unix_uri);
+ world->log().info(fmt("Listening on socket %1%\n") % unix_uri);
// Bind TCP socket
const int port = world->conf().option("engine-port").get<int32_t>();
@@ -60,7 +60,7 @@ ingen_listen(Ingen::World* world, Socket* unix_sock, Socket* net_sock)
world->log().error("Failed to create TCP socket\n");
net_sock->close();
}
- world->log().info(Raul::fmt("Listening on TCP port %1%\n") % port);
+ world->log().info(fmt("Listening on TCP port %1%\n") % port);
struct pollfd pfds[2];
int nfds = 0;
@@ -81,7 +81,7 @@ ingen_listen(Ingen::World* world, Socket* unix_sock, Socket* net_sock)
// Wait for input to arrive at a socket
const int ret = poll(pfds, nfds, -1);
if (ret == -1) {
- world->log().error(Raul::fmt("Poll error: %1%\n") % strerror(errno));
+ world->log().error(fmt("Poll error: %1%\n") % strerror(errno));
break;
} else if ((pfds[0].revents & POLLHUP) || pfds[1].revents & POLLHUP) {
break;