diff --git a/src/utils/proto.c b/src/utils/proto.c
index af47cdf11d51673684808bc206af14524dbec370..f8265d6861da71335da53a88d3c932b713c718e6 100644 (file)
--- a/src/utils/proto.c
+++ b/src/utils/proto.c
* return the number of bytes that would have been written if enough space had
* been available. */
+static ssize_t
+marshal_bool(char *buf, size_t buf_len, bool v)
+{
+ uint8_t t;
+ if (buf_len >= sizeof(t)) {
+ t = v ? 1 : 0;
+ memcpy(buf, &t, sizeof(t));
+ }
+ return sizeof(t);
+} /* marshal_bool */
+
+static ssize_t
+unmarshal_bool(const char *buf, size_t len, bool *v)
+{
+ uint8_t t;
+ if (len < sizeof(t))
+ return -1;
+ if (v) {
+ memcpy(&t, buf, sizeof(t));
+ *v = t != 0;
+ }
+ return sizeof(t);
+} /* unmarshal_bool */
+
static ssize_t
marshal_int64(char *buf, size_t buf_len, int64_t v)
{
if (datum->type == SDB_TYPE_NULL)
return len;
- if (datum->type == SDB_TYPE_INTEGER)
+ if (datum->type == SDB_TYPE_BOOLEAN)
+ n = marshal_bool(buf, buf_len, datum->data.boolean);
+ else if (datum->type == SDB_TYPE_INTEGER)
n = marshal_int64(buf, buf_len, datum->data.integer);
else if (datum->type == SDB_TYPE_DECIMAL)
n = marshal_double(buf, buf_len, datum->data.decimal);
type = datum->type & 0xff;
for (i = 0; i < datum->data.array.length; ++i) {
- if (type == SDB_TYPE_INTEGER) {
+ if (type == SDB_TYPE_BOOLEAN) {
+ bool *v = datum->data.array.values;
+ n = marshal_bool(buf, buf_len, v[i]);
+ }
+ else if (type == SDB_TYPE_INTEGER) {
int64_t *v = datum->data.array.values;
n = marshal_int64(buf, buf_len, v[i]);
}
/* Don't populate 'd' if 'datum' is NULL. */
#define D(field) (datum ? &d.data.field : NULL)
- if (d.type == SDB_TYPE_INTEGER)
+ if (d.type == SDB_TYPE_BOOLEAN)
+ n = unmarshal_bool(buf, len, D(boolean));
+ else if (d.type == SDB_TYPE_INTEGER)
n = unmarshal_int64(buf, len, D(integer));
else if (d.type == SDB_TYPE_DECIMAL)
n = unmarshal_double(buf, len, D(decimal));
d.data.array.values = calloc(d.data.array.length,
sdb_data_sizeof(d.type & 0xff));
for (i = 0; i < d.data.array.length; ++i) {
- if ((d.type & 0xff) == SDB_TYPE_INTEGER) {
+ if ((d.type & 0xff) == SDB_TYPE_BOOLEAN) {
+ bool *v = d.data.array.values;
+ n = unmarshal_bool(buf, len, V());
+ }
+ else if ((d.type & 0xff) == SDB_TYPE_INTEGER) {
int64_t *v = d.data.array.values;
n = unmarshal_int64(buf, len, V());
}