Clean-up: run format-cpp on the tree

[lttng-tools.git] / tests / regression / ust / multi-lib / multi-lib-test.c

diff --git a/tests/regression/ust/multi-lib/multi-lib-test.c b/tests/regression/ust/multi-lib/multi-lib-test.c
index 6a91089df27dc0c1281060d0e11a897354237efd..155ef81ae27ebc6ba7c699916129ab48425fc915 100644 (file)
--- a/tests/regression/ust/multi-lib/multi-lib-test.c
+++ b/tests/regression/ust/multi-lib/multi-lib-test.c
@@ -6,32 +6,37 @@
  */
 
 #include <dlfcn.h>
+#include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <popt.h>
 
 #if HAS_CALLSITES
 #include "callsites.h"
 #endif
 
-void exec_callsite()
+void exec_callsite(void);
+void exec_callsite(void)
 {
 #if HAS_CALLSITES
        call_tracepoint();
 #endif
 }
 
-void print_list(void)
+static void print_list(void)
 {
        fprintf(stderr, "Test list (-t X):\n");
-       fprintf(stderr, "\t0: dlopen() all libraries pass in arguments and execute "
-                       "the callsite.\n");
-       fprintf(stderr, "\t1: simulate the upgrade of a probe provider using dlopen() and dlclose(). \n");
-       fprintf(stderr, "\t2: simulate the upgrade of a library containing the callsites using dlopen() and dlclose(). \n");
+       fprintf(stderr,
+               "\t0: dlopen() all libraries pass in arguments and execute "
+               "the callsite.\n");
+       fprintf(stderr,
+               "\t1: simulate the upgrade of a probe provider using dlopen() and dlclose(). \n");
+       fprintf(stderr,
+               "\t2: simulate the upgrade of a library containing the callsites using dlopen() and dlclose(). \n");
 }
 
-int dl_open_all(int nb_libraries, char **libraries)
+#if HAS_CALLSITES
+static int dl_open_all(int nb_libraries, char **libraries)
 {
        int i, ret = 0;
        void **handles;
@@ -61,7 +66,7 @@ error:
  * Takes 2 paths to libraries, dlopen() the first, trace, dlopen() the second,
  * and dlclose the first to simulate the upgrade of a library.
  */
-int upgrade_lib(int nb_libraries, char **libraries)
+static int upgrade_lib(int nb_libraries, char **libraries)
 {
        int i, ret = 0;
        void *handles[2];
@@ -92,12 +97,14 @@ int upgrade_lib(int nb_libraries, char **libraries)
 error:
        return ret;
 }
+#endif /* HAS_CALLSITES */
 
+#if !HAS_CALLSITES
 /*
  * Simulate the upgrade of a library containing a callsite.
  * Receives two libraries containing callsites for the same tracepoint.
  */
-int upgrade_callsite(int nb_libraries, char **libraries)
+static int upgrade_callsite(int nb_libraries, char **libraries)
 {
        int ret = 0;
        void *handles[2];
@@ -159,6 +166,7 @@ int upgrade_callsite(int nb_libraries, char **libraries)
 error:
        return ret;
 }
+#endif /* !HAS_CALLSITES */
 
 int main(int argc, const char **argv)
 {
@@ -166,10 +174,9 @@ int main(int argc, const char **argv)
        char **libraries = NULL;
        poptContext optCon;
        struct poptOption optionsTable[] = {
-                       { "test", 't', POPT_ARG_INT, &test, 0, "Test to run", NULL },
-                       { "list", 'l', 0, 0, 'l', "List of tests (-t X)", NULL },
-                       POPT_AUTOHELP
-                       { NULL, 0, 0, NULL, 0 }
+               { "test", 't', POPT_ARG_INT, &test, 0, "Test to run", NULL },
+               { "list", 'l', 0, 0, 'l', "List of tests (-t X)", NULL },
+               POPT_AUTOHELP{ NULL, 0, 0, NULL, 0, NULL, NULL }
        };
 
        optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
@@ -180,7 +187,7 @@ int main(int argc, const char **argv)
        }
 
        while ((c = poptGetNextOpt(optCon)) >= 0) {
-               switch(c) {
+               switch (c) {
                case 'l':
                        print_list();
                        goto error;
@@ -203,29 +210,35 @@ int main(int argc, const char **argv)
                libraries[nb_libraries - 1] = (char *) poptGetArg(optCon);
        }
 
-       switch(test) {
+       switch (test) {
        case 0:
 #if HAS_CALLSITES
                ret = dl_open_all(nb_libraries, libraries);
 #else
-               fprintf(stderr, "Test not implemented for configuration "
-                               "(HAS_CALLSITES=%d)\n", HAS_CALLSITES == 1);
+               fprintf(stderr,
+                       "Test not implemented for configuration "
+                       "(HAS_CALLSITES=%d)\n",
+                       HAS_CALLSITES == 1);
 #endif
                break;
        case 1:
 #if HAS_CALLSITES
                ret = upgrade_lib(nb_libraries, libraries);
 #else
-               fprintf(stderr, "Test not implemented for configuration "
-                               "(HAS_CALLSITES=%d)\n", HAS_CALLSITES == 1);
+               fprintf(stderr,
+                       "Test not implemented for configuration "
+                       "(HAS_CALLSITES=%d)\n",
+                       HAS_CALLSITES == 1);
 #endif
                break;
        case 2:
 #if !HAS_CALLSITES
                ret = upgrade_callsite(nb_libraries, libraries);
 #else
-               fprintf(stderr, "Test not implemented for configuration "
-                               "(HAS_CALLSITES=%d)\n", HAS_CALLSITES == 1);
+               fprintf(stderr,
+                       "Test not implemented for configuration "
+                       "(HAS_CALLSITES=%d)\n",
+                       HAS_CALLSITES == 1);
 #endif
                break;
        default: