format

Author: DenisBiryukov91

include/zenoh-pico/api/olv_macros.h

@@ -160,5 +160,4 @@
 // Gets internal value from refcounted owned type (e.g. z_owned_session_t, z_owned_query_t)
 #define _Z_OWNED_RC_IN_VAL(arg) ((arg)->_rc.in->val)
 
-
 #endif /* INCLUDE_ZENOH_PICO_API_OLV_MACROS_H */

include/zenoh-pico/api/primitives.h

@@ -928,11 +928,11 @@ int64_t z_bytes_reader_tell(z_bytes_reader_t *reader);
  * Return:
  *   ``0`` if encode successful, ``negative value`` otherwise.
  */
-int8_t z_bytes_get_writer(z_loaned_bytes_t *bytes, z_owned_bytes_writer_t* writer);
+int8_t z_bytes_get_writer(z_loaned_bytes_t *bytes, z_owned_bytes_writer_t *writer);
 
 /**
  * Writes `len` bytes from `src` into underlying :c:type:`z_loaned_bytes_t.
- * 
+ *
  * Parameters:
  *   writer: A data writer
  *   src: Buffer to write from.

include/zenoh-pico/collections/bytes.h

@@ -98,9 +98,8 @@ typedef struct {
 _z_bytes_iterator_t _z_bytes_get_iterator(const _z_bytes_t *bytes);
 _Bool _z_bytes_iterator_next(_z_bytes_iterator_t *iter, _z_bytes_t *b);
 
-
 typedef struct {
-    uint8_t* cache;
+    uint8_t *cache;
     size_t cache_size;
     _z_bytes_t *bytes;
 } _z_bytes_writer_t;

src/api/api.c

@@ -493,11 +493,11 @@ _Bool z_bytes_iterator_next(z_bytes_iterator_t *iter, z_owned_bytes_t *bytes) {
     return true;
 }
 
-int8_t z_bytes_get_writer(z_loaned_bytes_t *bytes, z_owned_bytes_writer_t* writer) {
+int8_t z_bytes_get_writer(z_loaned_bytes_t *bytes, z_owned_bytes_writer_t *writer) {
     writer->_val = (z_loaned_bytes_writer_t *)z_malloc(sizeof(z_loaned_bytes_writer_t));
     if (writer->_val == NULL) return _Z_ERR_SYSTEM_OUT_OF_MEMORY;
     *writer->_val = _z_bytes_get_writer(bytes, Z_IOSLICE_SIZE);
-    return _Z_RES_OK; 
+    return _Z_RES_OK;
 }
 
 int8_t z_bytes_writer_write(z_loaned_bytes_writer_t *writer, const uint8_t *src, size_t len) {
@@ -607,7 +607,6 @@ _Z_OWNED_FUNCTIONS_PTR_IMPL(_z_slice_t, slice, _z_slice_copy, _z_slice_free)
 _Z_OWNED_FUNCTIONS_PTR_IMPL(_z_bytes_t, bytes, _z_bytes_copy, _z_bytes_free)
 _Z_OWNED_FUNCTIONS_PTR_TRIVIAL_IMPL(_z_bytes_writer_t, bytes_writer)
 
-
 #if Z_FEATURE_PUBLICATION == 1 || Z_FEATURE_QUERYABLE == 1 || Z_FEATURE_QUERY == 1
 // Convert a user owned bytes payload to an internal bytes payload, returning an empty one if value invalid
 static _z_bytes_t _z_bytes_from_owned_bytes(z_owned_bytes_t *bytes) {

src/collections/bytes.c

@@ -18,11 +18,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "zenoh-pico/api/olv_macros.h"
 #include "zenoh-pico/protocol/codec/core.h"
 #include "zenoh-pico/system/platform.h"
 #include "zenoh-pico/utils/endianness.h"
 #include "zenoh-pico/utils/result.h"
-#include "zenoh-pico/api/olv_macros.h"
 
 /*-------- Bytes --------*/
 _Bool _z_bytes_check(const _z_bytes_t *bytes) { return !_z_bytes_is_empty(bytes); }
@@ -133,11 +133,9 @@ int8_t _z_bytes_to_slice(const _z_bytes_t *bytes, _z_slice_t *s) {
     return _Z_RES_OK;
 }
 
-int8_t _z_bytes_append_slice(_z_bytes_t *dst, _z_arc_slice_t *s) { 
-    _Z_CLEAN_RETURN_IF_ERR(
-        _z_arc_slice_svec_append(&dst->_slices, s) ? _Z_RES_OK : _Z_ERR_SYSTEM_OUT_OF_MEMORY,
-        _z_arc_slice_drop(s)
-    );
+int8_t _z_bytes_append_slice(_z_bytes_t *dst, _z_arc_slice_t *s) {
+    _Z_CLEAN_RETURN_IF_ERR(_z_arc_slice_svec_append(&dst->_slices, s) ? _Z_RES_OK : _Z_ERR_SYSTEM_OUT_OF_MEMORY,
+                           _z_arc_slice_drop(s));
     return _Z_RES_OK;
 }
 
@@ -428,11 +426,7 @@ _Bool _z_bytes_iterator_next(_z_bytes_iterator_t *iter, _z_bytes_t *b) {
 }
 
 _z_bytes_writer_t _z_bytes_get_writer(_z_bytes_t *bytes, size_t cache_size) {
-    return (_z_bytes_writer_t) {
-        .cache = NULL,
-        .cache_size = cache_size,
-        .bytes = bytes
-    };
+    return (_z_bytes_writer_t){.cache = NULL, .cache_size = cache_size, .bytes = bytes};
 }
 
 int8_t _z_bytes_writer_ensure_cache(_z_bytes_writer_t *writer) {
@@ -454,27 +448,24 @@ int8_t _z_bytes_writer_ensure_cache(_z_bytes_writer_t *writer) {
         return _Z_ERR_SYSTEM_OUT_OF_MEMORY;
     }
 
-    _Z_CLEAN_RETURN_IF_ERR(
-        _z_bytes_append_slice(writer->bytes, &cache),
-        _z_arc_slice_drop(&cache)
-    );
-    writer->cache = (uint8_t*)_Z_RC_IN_VAL(&cache.slice).start;
+    _Z_CLEAN_RETURN_IF_ERR(_z_bytes_append_slice(writer->bytes, &cache), _z_arc_slice_drop(&cache));
+    writer->cache = (uint8_t *)_Z_RC_IN_VAL(&cache.slice).start;
     return _Z_RES_OK;
 }
 
 int8_t _z_bytes_writer_write(_z_bytes_writer_t *writer, const uint8_t *src, size_t len) {
-    if (writer->cache_size == 0) { // no cache append data as a single slice
+    if (writer->cache_size == 0) {  // no cache append data as a single slice
         _z_slice_t s = _z_slice_wrap_copy(src, len);
         if (s.len != len) return _Z_ERR_SYSTEM_OUT_OF_MEMORY;
         _z_arc_slice_t arc_s = _z_arc_slice_wrap(s, 0, len);
-        if _Z_RC_IS_NULL(&arc_s.slice) {
+        if _Z_RC_IS_NULL (&arc_s.slice) {
             _z_slice_clear(&s);
             return _Z_ERR_SYSTEM_OUT_OF_MEMORY;
         }
         return _z_bytes_append_slice(writer->bytes, &arc_s);
     }
 
-    while (len > 0) { 
+    while (len > 0) {
         _Z_RETURN_IF_ERR(_z_bytes_writer_ensure_cache(writer));
         _z_arc_slice_t *arc_s = _z_bytes_get_slice(writer->bytes, _z_bytes_num_slices(writer->bytes) - 1);
         size_t remaining_in_cache = _Z_RC_IN_VAL(&arc_s->slice).len - arc_s->len;
@@ -488,11 +479,8 @@ int8_t _z_bytes_writer_write(_z_bytes_writer_t *writer, const uint8_t *src, size
     return _Z_RES_OK;
 }
 
-
 _z_bytes_iterator_writer_t _z_bytes_get_iterator_writer(_z_bytes_t *bytes) {
-    return (_z_bytes_iterator_writer_t){
-        .writer = _z_bytes_get_writer(bytes, 0)
-    };
+    return (_z_bytes_iterator_writer_t){.writer = _z_bytes_get_writer(bytes, 0)};
 }
 int8_t _z_bytes_iterator_writer_write(_z_bytes_iterator_writer_t *writer, _z_bytes_t *src) {
     uint8_t l_buf[16];

tests/z_bytes_test.c

@@ -161,7 +161,6 @@ void test_reader_seek(void) {
     _z_bytes_drop(&b);
 }
 
-
 void test_writer_no_cache(void) {
     uint8_t data1[5] = {1, 2, 3, 4, 5};
     uint8_t data2[5] = {1, 2, 6, 7, 8};
@@ -190,7 +189,7 @@ void test_writer_with_cache(void) {
     uint8_t data1[5] = {1, 2, 3, 4, 5};
     uint8_t data2[5] = {1, 2, 6, 7, 8};
     uint8_t data3[3] = {3, 9, 10};
-    
+
     uint8_t data1_out[7] = {1, 2, 3, 4, 5, 1, 2};
     uint8_t data2_out[6] = {6, 7, 8, 3, 9, 10};
     _z_bytes_t b = _z_bytes_null();
@@ -213,7 +212,6 @@ void test_writer_with_cache(void) {
     _z_bytes_drop(&b);
 }
 
-
 int main(void) {
     test_null_bytes();
     test_slice();