Refactoring: add back constness of public API structures

[lttng-ust.git] / tests / compile / test-app-ctx / hello.c

diff --git a/tests/compile/test-app-ctx/hello.c b/tests/compile/test-app-ctx/hello.c
index 6e16b12fac871b19e011fc60f03a6433b6df0990..9cc8f1a82b99209961177f0fb620dac85af9c3df 100644 (file)
--- a/tests/compile/test-app-ctx/hello.c
+++ b/tests/compile/test-app-ctx/hello.c
@@ -35,13 +35,14 @@ struct mmsghdr;
 
 static __thread unsigned int test_count;
 
+static
 void test_inc_count(void)
 {
        test_count++;
 }
 
 static
-size_t test_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t test_get_size(void *priv __attribute__((unused)), size_t offset)
 {
        int sel = test_count % _NR_LTTNG_UST_DYNAMIC_TYPES;
        size_t size = 0;
@@ -102,7 +103,7 @@ size_t test_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 }
 
 static
-void test_record(struct lttng_ust_ctx_field *field,
+void test_record(void *priv __attribute__((unused)),
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct lttng_ust_channel_buffer *lttng_chan_buf)
 {
@@ -195,7 +196,7 @@ void test_record(struct lttng_ust_ctx_field *field,
 }
 
 static
-void test_get_value(struct lttng_ust_ctx_field *field,
+void test_get_value(void *priv __attribute__((unused)),
                struct lttng_ust_ctx_value *value)
 {
        int sel = test_count % _NR_LTTNG_UST_DYNAMIC_TYPES;
@@ -242,20 +243,23 @@ void test_get_value(struct lttng_ust_ctx_field *field,
        }
 }
 
+static char myprovider_name[] = "$app.myprovider";
 struct lttng_ust_context_provider myprovider = {
        .struct_size = sizeof(struct lttng_ust_context_provider),
-       .name = "$app.myprovider",
+       .name = myprovider_name,
        .get_size = test_get_size,
        .record = test_record,
        .get_value = test_get_value,
 };
 
-void inthandler(int sig)
+static
+void inthandler(int sig __attribute__((unused)))
 {
        printf("in SIGUSR1 handler\n");
        tracepoint(ust_tests_hello, tptest_sighandler);
 }
 
+static
 int init_int_handler(void)
 {
        int result;
@@ -283,10 +287,9 @@ int init_int_handler(void)
        return 0;
 }
 
-void test_inc_count(void);
-
 int main(int argc, char **argv)
 {
+       struct lttng_ust_registered_context_provider *reg_provider;
        int i, netint;
        long values[] = { 1, 2, 3 };
        char text[10] = "test";
@@ -300,7 +303,8 @@ int main(int argc, char **argv)
        if (argc == 2)
                delay = atoi(argv[1]);
 
-       if (lttng_ust_context_provider_register(&myprovider))
+       reg_provider = lttng_ust_context_provider_register(&myprovider);
+       if (!reg_provider)
                abort();
 
        fprintf(stderr, "Hello, World!\n");
@@ -315,7 +319,7 @@ int main(int argc, char **argv)
                test_inc_count();
                //usleep(100000);
        }
-       lttng_ust_context_provider_unregister(&myprovider);
+       lttng_ust_context_provider_unregister(reg_provider);
        fprintf(stderr, " done.\n");
        return 0;
 }