Cleanup: namespace 'align' macros

[lttng-tools.git] / src / common / userspace-probe.c

diff --git a/src/common/userspace-probe.c b/src/common/userspace-probe.c
index 60bdddb4827211f02292fb975a2d4324d1dcba8b..f5ed86367066b3504dadab91d04810c4d69e441b 100644 (file)
--- a/src/common/userspace-probe.c
+++ b/src/common/userspace-probe.c
@@ -7,6 +7,7 @@
 
 #include "lttng/lttng-error.h"
 #include <common/compat/string.h>
+#include <common/align.h>
 #include <common/error.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
@@ -1179,7 +1180,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_userspace_probe_location_serialize(
                const struct lttng_userspace_probe_location *location,
                struct lttng_payload *payload)
@@ -1472,7 +1472,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_userspace_probe_location_create_from_payload(
                struct lttng_payload_view *view,
                struct lttng_userspace_probe_location **location)
@@ -1636,7 +1635,7 @@ int lttng_userspace_probe_location_function_flatten(
         * the next structure in the buffer probably needs to be
         * aligned too (depending on the arch).
         */
-       padding_needed = ALIGN_TO(storage_needed, sizeof(uint64_t)) - storage_needed;
+       padding_needed = lttng_align_ceil(storage_needed, sizeof(uint64_t)) - storage_needed;
        storage_needed += padding_needed;
 
        if (location->lookup_method) {
@@ -1764,7 +1763,7 @@ int lttng_userspace_probe_location_tracepoint_flatten(
         * the next structure in the buffer probably needs to be
         * aligned too (depending on the arch).
         */
-       padding_needed = ALIGN_TO(storage_needed, sizeof(uint64_t)) - storage_needed;
+       padding_needed = lttng_align_ceil(storage_needed, sizeof(uint64_t)) - storage_needed;
        storage_needed += padding_needed;
 
        if (location->lookup_method) {
@@ -1860,7 +1859,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_userspace_probe_location_flatten(
                const struct lttng_userspace_probe_location *location,
                struct lttng_dynamic_buffer *buffer)
@@ -1888,7 +1886,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
 struct lttng_userspace_probe_location *lttng_userspace_probe_location_copy(
                const struct lttng_userspace_probe_location *location)
 {
@@ -1923,7 +1920,6 @@ err:
        return new_location;
 }
 
-LTTNG_HIDDEN
 bool lttng_userspace_probe_location_lookup_method_is_equal(
                const struct lttng_userspace_probe_location_lookup_method *a,
                const struct lttng_userspace_probe_location_lookup_method *b)
@@ -1948,7 +1944,6 @@ end:
        return is_equal;
 }
 
-LTTNG_HIDDEN
 bool lttng_userspace_probe_location_is_equal(
                const struct lttng_userspace_probe_location *a,
                const struct lttng_userspace_probe_location *b)
@@ -1978,14 +1973,12 @@ end:
        return is_equal;
 }
 
-LTTNG_HIDDEN
 unsigned long lttng_userspace_probe_location_hash(
                const struct lttng_userspace_probe_location *location)
 {
        return location->hash(location);
 }
 
-LTTNG_HIDDEN
 enum lttng_error_code lttng_userspace_probe_location_mi_serialize(
                const struct lttng_userspace_probe_location *location,
                struct mi_writer *writer)