frontend/query: Use the new JSON formatter to implement LOOKUP.

[sysdb.git] / src / frontend / connection.c

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index a8dfeee86e93597b5239f9709487c867bb1a5670..bb0f494f2d432c849e4c60be174b3cfec3f786ab 100644 (file)
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -246,20 +246,6 @@ connection_log(int prio, const char *msg,
        return 0;
 } /* connection_log */
 
-static uint32_t
-connection_get_int32(sdb_conn_t *conn, size_t offset)
-{
-       const char *data;
-       uint32_t n;
-
-       assert(conn && (sdb_strbuf_len(conn->buf) >= offset + sizeof(uint32_t)));
-
-       data = sdb_strbuf_string(conn->buf);
-       memcpy(&n, data + offset, sizeof(n));
-       n = ntohl(n);
-       return n;
-} /* connection_get_int32 */
-
 static int
 command_handle(sdb_conn_t *conn)
 {
@@ -290,10 +276,13 @@ command_handle(sdb_conn_t *conn)
                status = -1;
        }
 
-       if (status)
+       if (status) {
+               if (! sdb_strbuf_len(conn->errbuf))
+                       sdb_strbuf_sprintf(conn->errbuf, "Failed to execute command");
                sdb_connection_send(conn, CONNECTION_ERROR,
                                (uint32_t)sdb_strbuf_len(conn->errbuf),
                                sdb_strbuf_string(conn->errbuf));
+       }
        return status;
 } /* command_handle */
 
@@ -311,8 +300,8 @@ command_init(sdb_conn_t *conn)
        /* reset */
        sdb_strbuf_clear(conn->errbuf);
 
-       conn->cmd = connection_get_int32(conn, 0);
-       conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
+       conn->cmd = sdb_proto_get_int(conn->buf, 0);
+       conn->cmd_len = sdb_proto_get_int(conn->buf, sizeof(uint32_t));
 
        sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));