Skip to content

Commit

Permalink
serialization fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@DenisBiryukov91
DenisBiryukov91 committed Jun 27, 2024
1 parent 00f9577 commit 57e2022
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 31 deletions.
51 changes: 21 additions & 30 deletions src/api/api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ int8_t z_bytes_deserialize_into_string(const z_loaned_bytes_t *bytes, z_owned_st
int8_t z_bytes_deserialize_into_pair(const z_loaned_bytes_t *bytes, z_owned_bytes_t *first, z_owned_bytes_t *second) {
// Init pair of owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(first));
_Z_CLEAN_RETURN_IF_ERR(z_bytes_empty(second), z_bytes_drop(second));
_Z_CLEAN_RETURN_IF_ERR(z_bytes_empty(second), z_bytes_drop(first));
return _z_bytes_deserialize_into_pair(bytes, first->_val, second->_val);
}

Expand All @@ -356,79 +356,70 @@ int8_t z_bytes_serialize_from_uint8(z_owned_bytes_t *bytes, uint8_t val) {
// Init owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(bytes));
// Encode data
int8_t res = _z_bytes_from_uint8(bytes->_val, val);
if (res != _Z_RES_OK) z_bytes_drop(bytes);
return res;
_Z_CLEAN_RETURN_IF_ERR(_z_bytes_from_uint8(bytes->_val, val), z_bytes_drop(bytes));
return _Z_RES_OK;
}

int8_t z_bytes_serialize_from_uint16(z_owned_bytes_t *bytes, uint16_t val) {
// Init owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(bytes));
// Encode data
int8_t res = _z_bytes_from_uint16(bytes->_val, val);
if (res != _Z_RES_OK) z_bytes_drop(bytes);
return res;
_Z_CLEAN_RETURN_IF_ERR(_z_bytes_from_uint16(bytes->_val, val), z_bytes_drop(bytes));
return _Z_RES_OK;
}

int8_t z_bytes_serialize_from_uint32(z_owned_bytes_t *bytes, uint32_t val) {
// Init owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(bytes));
// Encode data
int8_t res = _z_bytes_from_uint32(bytes->_val, val);
if (res != _Z_RES_OK) z_bytes_drop(bytes);
return res;
_Z_CLEAN_RETURN_IF_ERR(_z_bytes_from_uint32(bytes->_val, val), z_bytes_drop(bytes));
return _Z_RES_OK;
}

int8_t z_bytes_serialize_from_uint64(z_owned_bytes_t *bytes, uint64_t val) {
// Init owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(bytes));
// Encode data
int8_t res = _z_bytes_from_uint64(bytes->_val, val);
if (res != _Z_RES_OK) z_bytes_drop(bytes);
return res;
_Z_CLEAN_RETURN_IF_ERR(_z_bytes_from_uint64(bytes->_val, val), z_bytes_drop(bytes));
return _Z_RES_OK;
}

int8_t z_bytes_serialize_from_float(z_owned_bytes_t *bytes, float val) {
// Init owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(bytes));
// Encode data
int8_t res = _z_bytes_from_float(bytes->_val, val);
if (res != _Z_RES_OK) z_bytes_drop(bytes);
return res;
_Z_CLEAN_RETURN_IF_ERR(_z_bytes_from_float(bytes->_val, val), z_bytes_drop(bytes));
return _Z_RES_OK;
}

int8_t z_bytes_serialize_from_double(z_owned_bytes_t *bytes, double val) {
// Init owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(bytes));
// Encode data
int8_t res = _z_bytes_from_double(bytes->_val, val);
if (res != _Z_RES_OK) z_bytes_drop(bytes);
return res;
_Z_CLEAN_RETURN_IF_ERR(_z_bytes_from_double(bytes->_val, val), z_bytes_drop(bytes));
return _Z_RES_OK;
}

int8_t z_bytes_serialize_from_slice(z_owned_bytes_t *bytes, const uint8_t *data, size_t len) {
// Init owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(bytes));
// Encode data
_z_slice_t s = _z_slice_wrap((uint8_t *)data, len);
int8_t res = _z_bytes_from_slice(bytes->_val, s);
if (res != _Z_RES_OK) z_bytes_drop(bytes);
return res;
_Z_CLEAN_RETURN_IF_ERR(_z_bytes_from_slice(bytes->_val, s), z_bytes_drop(bytes));
return _Z_RES_OK;
}

int8_t z_bytes_serialize_from_slice_copy(z_owned_bytes_t *bytes, const uint8_t *data, size_t len) {
// Init owned bytes
_Z_RETURN_IF_ERR(z_bytes_empty(bytes));
// Allocate bytes
_z_slice_t s = _z_slice_make(len);
_z_slice_t s = _z_slice_wrap_copy((uint8_t *)data, len);
if (!_z_slice_check(s) && len > 0) {
return _Z_ERR_SYSTEM_OUT_OF_MEMORY;
}
// Copy data
memcpy((uint8_t *)s.start, data, len);
int8_t res = _z_bytes_from_slice(bytes->_val, s);
if (res != _Z_RES_OK) z_bytes_drop(bytes);
return res;

// Init owned bytes
_Z_CLEAN_RETURN_IF_ERR(z_bytes_empty(bytes), _z_slice_clear(&s));
_Z_CLEAN_RETURN_IF_ERR(_z_bytes_from_slice(bytes->_val, s), _z_slice_clear(&s); z_bytes_drop(bytes));
return _Z_RES_OK;
}

int8_t z_bytes_serialize_from_string(z_owned_bytes_t *bytes, const char *s) {
Expand Down
2 changes: 1 addition & 1 deletion zenohpico.pc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ prefix=/usr/local
Name: zenohpico
Description:
URL:
Version: 0.11.20240626dev
Version: 0.11.20240627dev
Cflags: -I${prefix}/include
Libs: -L${prefix}/lib -lzenohpico

0 comments on commit 57e2022

Please sign in to comment.