diff --git a/src/frontend/query.c b/src/frontend/query.c
index 4580e57e9714753682b55bb0bebd2de96f231647..63ec226c6dc17cea869c3187a66908f28b26117f 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
sdb_fe_fetch(sdb_conn_t *conn)
{
char name[conn->cmd_len + 1];
- int type;
+ uint32_t type;
if ((! conn) || (conn->cmd != SDB_CONNECTION_FETCH))
return -1;
return -1;
}
- type = sdb_proto_unmarshal_int(conn->buf, 0);
+ sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
strncpy(name, sdb_strbuf_string(conn->buf) + sizeof(uint32_t),
conn->cmd_len - sizeof(uint32_t));
name[sizeof(name) - 1] = '\0';
/* TODO: support other types besides hosts */
- return sdb_fe_exec_fetch(conn, type, name, NULL, /* filter = */ NULL);
+ return sdb_fe_exec_fetch(conn, (int)type, name, NULL, /* filter = */ NULL);
} /* sdb_fe_fetch */
int
sdb_fe_list(sdb_conn_t *conn)
{
- int type = SDB_HOST;
+ uint32_t type = SDB_HOST;
if ((! conn) || (conn->cmd != SDB_CONNECTION_LIST))
return -1;
if (conn->cmd_len == sizeof(uint32_t))
- type = sdb_proto_unmarshal_int(conn->buf, 0);
+ sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
else if (conn->cmd_len) {
sdb_log(SDB_LOG_ERR, "frontend: Invalid command length %d for "
"LIST command", conn->cmd_len);
conn->cmd_len);
return -1;
}
- return sdb_fe_exec_list(conn, type, /* filter = */ NULL);
+ return sdb_fe_exec_list(conn, (int)type, /* filter = */ NULL);
} /* sdb_fe_list */
int
const char *matcher;
size_t matcher_len;
- int type;
+ uint32_t type;
int status;
conn_matcher_t m_node = {
conn->cmd_len);
return -1;
}
- type = sdb_proto_unmarshal_int(conn->buf, 0);
+ sdb_proto_unmarshal_int32(SDB_STRBUF_STR(conn->buf), &type);
matcher = sdb_strbuf_string(conn->buf) + sizeof(uint32_t);
matcher_len = conn->cmd_len - sizeof(uint32_t);
return -1;
}
- node.type = type;
+ node.type = (int)type;
m_node.matcher = m;
/* run analyzer separately; parse_matcher is missing
status = -1;
}
else
- status = sdb_fe_exec_lookup(conn, type, m, /* filter = */ NULL);
+ status = sdb_fe_exec_lookup(conn, (int)type, m, /* filter = */ NULL);
sdb_object_deref(SDB_OBJ(m));
return status;
} /* sdb_fe_lookup */