Use the dynamic buffer to serialize notification objects

[lttng-tools.git] / src / common / condition.c

diff --git a/src/common/condition.c b/src/common/condition.c
index 60d32e6cc7816c461dd0f9a0bdee6340e3ea1e45..9a9e9babdfa19a7145f22508bc81b863f1406078 100644 (file)
--- a/src/common/condition.c
+++ b/src/common/condition.c
@@ -63,32 +63,29 @@ end:
 }
 
 LTTNG_HIDDEN
-ssize_t lttng_condition_serialize(const struct lttng_condition *condition,
-               char *buf)
+int lttng_condition_serialize(const struct lttng_condition *condition,
+               struct lttng_dynamic_buffer *buf)
 {
-       ssize_t ret, condition_size;
-       struct lttng_condition_comm condition_comm = {
-               .condition_type = (int8_t) (condition ?
-                               condition->type : LTTNG_CONDITION_TYPE_UNKNOWN)
-       };
+       int ret;
+       struct lttng_condition_comm condition_comm = { 0 };
 
        if (!condition) {
                ret = -1;
                goto end;
        }
 
-       ret = sizeof(struct lttng_condition_comm);
-       if (buf) {
-               memcpy(buf, &condition_comm, ret);
-               buf += ret;
+       condition_comm.condition_type = (int8_t) condition->type;
+
+       ret = lttng_dynamic_buffer_append(buf, &condition_comm,
+                       sizeof(condition_comm));
+       if (ret) {
+               goto end;
        }
 
-       condition_size = condition->serialize(condition, buf);
-       if (condition_size < 0) {
-               ret = condition_size;
+       ret = condition->serialize(condition, buf);
+       if (ret) {
                goto end;
        }
-       ret += condition_size;
 end:
        return ret;
 }