Refactoring: add back constness of public API structures

[lttng-ust.git] / liblttng-ust-comm / lttng-ust-comm.c

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 0b6aa293c696516cbaa5a101dd96a983cad3a151..d5d193d75ff60c39cd5d14bd9a068dc74d67bf1f 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -37,16 +37,16 @@
 
 static
 ssize_t count_fields_recursive(size_t nr_fields,
-               struct lttng_ust_event_field **lttng_fields);
+               const struct lttng_ust_event_field **lttng_fields);
 static
 int serialize_one_field(struct lttng_ust_session *session,
                struct ustctl_field *fields, size_t *iter_output,
-               struct lttng_ust_event_field *lf);
+               const struct lttng_ust_event_field *lf);
 static
 int serialize_fields(struct lttng_ust_session *session,
                struct ustctl_field *ustctl_fields,
                size_t *iter_output, size_t nr_lttng_fields,
-               struct lttng_ust_event_field **lttng_fields);
+               const struct lttng_ust_event_field **lttng_fields);
 
 /*
  * Human readable error message.
@@ -70,19 +70,18 @@ static const char *ustcomm_readable_code[] = {
 
 /*
  * lttng_ust_strerror
+ * @code: must be a negative value of enum lttng_ust_error_code (or 0).
  *
- * Receives positive error value.
- * Return ptr to string representing a human readable
- * error code from the ustcomm_return_code enum.
+ * Returns a ptr to a string representing a human readable error code from the
+ * ustcomm_return_code enum.
  */
 const char *lttng_ust_strerror(int code)
 {
-       if (code == LTTNG_UST_OK)
-               return ustcomm_readable_code[USTCOMM_CODE_OFFSET(code)];
-       if (code < LTTNG_UST_ERR)
-               return strerror(code);
-       if (code >= LTTNG_UST_ERR_NR)
+       code = -code;
+
+       if (code < LTTNG_UST_OK || code >= LTTNG_UST_ERR_NR)
                code = LTTNG_UST_ERR;
+
        return ustcomm_readable_code[USTCOMM_CODE_OFFSET(code)];
 }
 
@@ -699,7 +698,7 @@ error:
 }
 
 int ustcomm_recv_stream_from_sessiond(int sock,
-               uint64_t *memory_map_size,
+               uint64_t *memory_map_size __attribute__((unused)),
                int *shm_fd, int *wakeup_fd)
 {
        ssize_t len;
@@ -865,7 +864,7 @@ int ustcomm_send_reg_msg(int sock,
 }
 
 static
-ssize_t count_one_type(struct lttng_ust_type_common *lt)
+ssize_t count_one_type(const struct lttng_ust_type_common *lt)
 {
        switch (lt->type) {
        case lttng_ust_type_integer:
@@ -884,7 +883,7 @@ ssize_t count_one_type(struct lttng_ust_type_common *lt)
 
        case lttng_ust_type_dynamic:
        {
-               struct lttng_ust_event_field **choices;
+               const struct lttng_ust_event_field **choices;
                size_t nr_choices;
                int ret;
 
@@ -907,7 +906,7 @@ ssize_t count_one_type(struct lttng_ust_type_common *lt)
 
 static
 ssize_t count_fields_recursive(size_t nr_fields,
-               struct lttng_ust_event_field **lttng_fields)
+               const struct lttng_ust_event_field **lttng_fields)
 {
        int i;
        ssize_t ret, count = 0;
@@ -929,7 +928,7 @@ ssize_t count_fields_recursive(size_t nr_fields,
 
 static
 ssize_t count_ctx_fields_recursive(size_t nr_fields,
-               struct lttng_ust_ctx_field **lttng_fields)
+               struct lttng_ust_ctx_field *lttng_fields)
 {
        int i;
        ssize_t ret, count = 0;
@@ -937,7 +936,7 @@ ssize_t count_ctx_fields_recursive(size_t nr_fields,
        for (i = 0; i < nr_fields; i++) {
                const struct lttng_ust_event_field *lf;
 
-               lf = lttng_fields[i]->event_field;
+               lf = lttng_fields[i].event_field;
                /* skip 'nowrite' fields */
                if (lf->nowrite)
                        continue;
@@ -992,10 +991,10 @@ int serialize_dynamic_type(struct lttng_ust_session *session,
                struct ustctl_field *fields, size_t *iter_output,
                const char *field_name)
 {
-       struct lttng_ust_event_field **choices;
+       const struct lttng_ust_event_field **choices;
        char tag_field_name[LTTNG_UST_ABI_SYM_NAME_LEN];
-       struct lttng_ust_type_common *tag_type;
-       struct lttng_ust_event_field *tag_field_generic;
+       const struct lttng_ust_type_common *tag_type;
+       const struct lttng_ust_event_field *tag_field_generic;
        struct lttng_ust_event_field tag_field = {
                .name = tag_field_name,
                .nowrite = 0,
@@ -1049,7 +1048,7 @@ int serialize_dynamic_type(struct lttng_ust_session *session,
 static
 int serialize_one_type(struct lttng_ust_session *session,
                struct ustctl_field *fields, size_t *iter_output,
-               const char *field_name, struct lttng_ust_type_common *lt,
+               const char *field_name, const struct lttng_ust_type_common *lt,
                enum lttng_ust_string_encoding parent_encoding)
 {
        int ret;
@@ -1084,7 +1083,7 @@ int serialize_one_type(struct lttng_ust_session *session,
                struct ustctl_field *uf = &fields[*iter_output];
                struct ustctl_type *ut = &uf->type;
                struct ustctl_float_type *uft;
-               struct lttng_ust_type_float *lft;
+               const struct lttng_ust_type_float *lft;
 
                if (field_name) {
                        strncpy(uf->name, field_name, LTTNG_UST_ABI_SYM_NAME_LEN);
@@ -1244,7 +1243,7 @@ int serialize_one_type(struct lttng_ust_session *session,
 static
 int serialize_one_field(struct lttng_ust_session *session,
                struct ustctl_field *fields, size_t *iter_output,
-               struct lttng_ust_event_field *lf)
+               const struct lttng_ust_event_field *lf)
 {
        /* skip 'nowrite' fields */
        if (lf->nowrite)
@@ -1257,7 +1256,7 @@ static
 int serialize_fields(struct lttng_ust_session *session,
                struct ustctl_field *ustctl_fields,
                size_t *iter_output, size_t nr_lttng_fields,
-               struct lttng_ust_event_field **lttng_fields)
+               const struct lttng_ust_event_field **lttng_fields)
 {
        int ret;
        size_t i;
@@ -1276,7 +1275,7 @@ int alloc_serialize_fields(struct lttng_ust_session *session,
                size_t *_nr_write_fields,
                struct ustctl_field **ustctl_fields,
                size_t nr_fields,
-               struct lttng_ust_event_field **lttng_fields)
+               const struct lttng_ust_event_field **lttng_fields)
 {
        struct ustctl_field *fields;
        int ret;
@@ -1309,7 +1308,7 @@ error_type:
 static
 int serialize_entries(struct ustctl_enum_entry **_entries,
                size_t nr_entries,
-               struct lttng_ust_enum_entry **lttng_entries)
+               const struct lttng_ust_enum_entry **lttng_entries)
 {
        struct ustctl_enum_entry *entries;
        int i;
@@ -1346,7 +1345,7 @@ int serialize_ctx_fields(struct lttng_ust_session *session,
                size_t *_nr_write_fields,
                struct ustctl_field **ustctl_fields,
                size_t nr_fields,
-               struct lttng_ust_ctx_field **lttng_fields)
+               struct lttng_ust_ctx_field *lttng_fields)
 {
        struct ustctl_field *fields;
        int ret;
@@ -1365,7 +1364,7 @@ int serialize_ctx_fields(struct lttng_ust_session *session,
 
        for (i = 0; i < nr_fields; i++) {
                ret = serialize_one_field(session, fields, &iter_output,
-                               lttng_fields[i]->event_field);
+                               lttng_fields[i].event_field);
                if (ret)
                        goto error_type;
        }
@@ -1390,7 +1389,7 @@ int ustcomm_register_event(int sock,
        int loglevel,
        const char *signature,          /* event signature (input) */
        size_t nr_fields,               /* fields */
-       struct lttng_ust_event_field **lttng_fields,
+       const struct lttng_ust_event_field **lttng_fields,
        const char *model_emf_uri,
        uint32_t *id)                   /* event id (output) */
 {
@@ -1529,7 +1528,7 @@ int ustcomm_register_enum(int sock,
        int session_objd,               /* session descriptor */
        const char *enum_name,          /* enum name (input) */
        size_t nr_entries,              /* entries */
-       struct lttng_ust_enum_entry **lttng_entries,
+       const struct lttng_ust_enum_entry **lttng_entries,
        uint64_t *id)
 {
        ssize_t len;
@@ -1634,7 +1633,7 @@ int ustcomm_register_channel(int sock,
        int session_objd,               /* session descriptor */
        int channel_objd,               /* channel descriptor */
        size_t nr_ctx_fields,
-       struct lttng_ust_ctx_field **ctx_fields,
+       struct lttng_ust_ctx_field *ctx_fields,
        uint32_t *chan_id,              /* channel id (output) */
        int *header_type)               /* header type (output) */
 {