ctdb-protocol: Add separator argument to ctdb_connection_to_buf()

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/protocol/protocol_util.c b/ctdb/protocol/protocol_util.c
index 28631c8de615432730dd2a9e9691832d8dce92ba..fe757658f482f7404158f54c9cadb398ef1ada59 100644 (file)
--- a/ctdb/protocol/protocol_util.c
+++ b/ctdb/protocol/protocol_util.c
@@ -497,8 +497,11 @@ bool ctdb_sock_addr_same(const ctdb_sock_addr *addr1,
        return (ctdb_sock_addr_cmp(addr1, addr2) == 0);
 }
 
-int ctdb_connection_to_buf(char *buf, size_t buflen,
-                          struct ctdb_connection *conn, bool client_first)
+int ctdb_connection_to_buf(char *buf,
+                          size_t buflen,
+                          struct ctdb_connection *conn,
+                          bool client_first,
+                          const char *sep)
 {
        char server[64], client[64];
        int ret;
@@ -516,9 +519,9 @@ int ctdb_connection_to_buf(char *buf, size_t buflen,
        }
 
        if (! client_first) {
-               ret = snprintf(buf, buflen, "%s %s", server, client);
+               ret = snprintf(buf, buflen, "%s%s%s", server, sep, client);
        } else {
-               ret = snprintf(buf, buflen, "%s %s", client, server);
+               ret = snprintf(buf, buflen, "%s%s%s", client, sep, server);
        }
        if (ret < 0 || (size_t)ret >= buflen) {
                return ENOSPC;
@@ -540,7 +543,7 @@ char *ctdb_connection_to_string(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       ret = ctdb_connection_to_buf(out, len, conn, client_first);
+       ret = ctdb_connection_to_buf(out, len, conn, client_first, " ");
        if (ret != 0) {
                talloc_free(out);
                return NULL;
@@ -666,8 +669,11 @@ char *ctdb_connection_list_to_string(
                char buf[128];
                int ret;
 
-               ret = ctdb_connection_to_buf(buf, sizeof(buf),
-                                            &conn_list->conn[i], client_first);
+               ret = ctdb_connection_to_buf(buf,
+                                            sizeof(buf),
+                                            &conn_list->conn[i],
+                                            client_first,
+                                            " ");
                if (ret != 0) {
                        talloc_free(out);
                        return NULL;

diff --git a/ctdb/protocol/protocol_util.h b/ctdb/protocol/protocol_util.h
index b01db8e99340b0c3d767cd51b27e10dcde71a060..2bdbb0c2ad01c05436b568ed23ae46e29920d055 100644 (file)
--- a/ctdb/protocol/protocol_util.h
+++ b/ctdb/protocol/protocol_util.h
@@ -55,8 +55,11 @@ bool ctdb_sock_addr_same_ip(const ctdb_sock_addr *addr1,
 bool ctdb_sock_addr_same(const ctdb_sock_addr *addr1,
                         const ctdb_sock_addr *addr2);
 
-int ctdb_connection_to_buf(char *buf, size_t buflen,
-                          struct ctdb_connection * conn, bool client_first);
+int ctdb_connection_to_buf(char *buf,
+                          size_t buflen,
+                          struct ctdb_connection * conn,
+                          bool client_first,
+                          const char *sep);
 char *ctdb_connection_to_string(TALLOC_CTX *mem_ctx,
                                struct ctdb_connection * conn,
                                bool client_first);