From 4cf68eab0566e32edb98949868eba332e1538967 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko Date: Wed, 5 Apr 2017 17:49:50 +0300 Subject: [PATCH] odissey: fix error string --- core/od_router.c | 3 +-- core/od_tls.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/od_router.c b/core/od_router.c index 5488b7f7..e099ab3a 100644 --- a/core/od_router.c +++ b/core/od_router.c @@ -170,8 +170,7 @@ void od_router(void *arg) case OD_RS_ECLIENT_WRITE: if (status == OD_RS_OK) od_log(&pooler->od->log, client->io, - "C: disconnected: %s", - machine_error(client->io)); + "C: disconnected"); else od_log(&pooler->od->log, client->io, "C: disconnected (read/write error): %s", diff --git a/core/od_tls.c b/core/od_tls.c index 5356a6e6..9747110c 100644 --- a/core/od_tls.c +++ b/core/od_tls.c @@ -209,8 +209,8 @@ od_tlsbe_connect(machine_t machine, od_debug(log, io, "%s (tls): supported", prefix); rc = machine_set_tls(io, tls); if (rc == -1) { - od_error(log, io, "%s (tls): %s", prefix, - machine_error(machine)); + od_error(log, io, "%s (tls): error: %s", prefix, + machine_error(io)); return -1; } od_debug(log, io, "%s (tls): ok", prefix); @@ -231,5 +231,6 @@ od_tlsbe_connect(machine_t machine, prefix); return -1; } + (void)machine; return 0; }