From d3aa8488dab63ef9eeb4a39c0053fd1b685fe4e9 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko Date: Wed, 23 Aug 2017 17:38:23 +0300 Subject: [PATCH] odissey: fix show clients string format id; update shapito --- sources/console.c | 8 ++++---- third_party/shapito | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/console.c b/sources/console.c index a919a562..1796ccc2 100644 --- a/sources/console.c +++ b/sources/console.c @@ -201,13 +201,13 @@ od_console_show_servers_callback(od_server_t *server, void *arg) /* user */ rc = shapito_be_write_data_row_add(stream, offset, route->id.user, - route->id.user_len); + route->id.user_len - 1); if (rc == -1) return -1; /* database */ rc = shapito_be_write_data_row_add(stream, offset, route->id.database, - route->id.database_len); + route->id.database_len - 1); if (rc == -1) return -1; /* state */ @@ -344,14 +344,14 @@ od_console_show_clients_callback(od_client_t *client, void *arg) /* user */ rc = shapito_be_write_data_row_add(stream, offset, shapito_parameter_value(client->startup.user), - client->startup.user->value_len); + client->startup.user->value_len - 1); if (rc == -1) return -1; /* database */ rc = shapito_be_write_data_row_add(stream, offset, shapito_parameter_value(client->startup.database), - client->startup.database->value_len); + client->startup.database->value_len - 1); if (rc == -1) return -1; /* state */ diff --git a/third_party/shapito b/third_party/shapito index c0f24e03..15304fc2 160000 --- a/third_party/shapito +++ b/third_party/shapito @@ -1 +1 @@ -Subproject commit c0f24e03ac453c55b885d2ca7ba641360487576e +Subproject commit 15304fc2db41bd8ed13e2f54ea9e0de54dd5c384