Remove stringify and add quotes directly in the configure

Some part of the path where the same as some defined variable and
the resulting string conversion gave the wrong result.

Remove the whole stringify function, since its use can be misleading

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/configure.ac b/configure.ac
index 716e97865d8d6959f4075bf9299664b8f0827259..9abc477c59b7b2a6f47c69eb0b7df4f324361c42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,10 +42,10 @@ AC_ARG_WITH([consumer64d-libdir],
        [CONSUMERD64_LIBDIR=''])
 AC_SUBST([CONSUMERD64_LIBDIR])
 
        [CONSUMERD64_LIBDIR=''])
 AC_SUBST([CONSUMERD64_LIBDIR])
 

-AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_BIN], $CONSUMERD32_BIN, [Location of the 32-bit consumerd executable.])
-AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_BIN], $CONSUMERD64_BIN, [Location of the 64-bit consumerd executable])
-AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], $CONSUMERD32_LIBDIR, [Search for consumerd 32-bit libraries in this location.])
-AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_LIBDIR], $CONSUMERD64_LIBDIR, [Search for consumerd 64-bit libraries in this location.])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_BIN], "$CONSUMERD32_BIN", [Location of the 32-bit consumerd executable.])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_BIN], "$CONSUMERD64_BIN", [Location of the 64-bit consumerd executable])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], "$CONSUMERD32_LIBDIR", [Search for consumerd 32-bit libraries in this location.])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_LIBDIR], "$CONSUMERD64_LIBDIR", [Search for consumerd 64-bit libraries in this location.])

 
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
 
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 55fd5e7bf5622b8a7fc71e5987712bb6c13fcfea..f7cd81027a43d103bed2499bc4e2bf8b257061be 100644 (file)
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -174,14 +174,10 @@ static struct ltt_session_list *session_list_ptr;
 int ust_consumerd64_fd = -1;
 int ust_consumerd32_fd = -1;
 
 int ust_consumerd64_fd = -1;
 int ust_consumerd32_fd = -1;
 

-static const char *consumerd32_bin =
-       __stringify(CONFIG_CONSUMERD32_BIN);
-static const char *consumerd64_bin =
-       __stringify(CONFIG_CONSUMERD64_BIN);
-static const char *consumerd32_libdir =
-       __stringify(CONFIG_CONSUMERD32_LIBDIR);
-static const char *consumerd64_libdir =
-       __stringify(CONFIG_CONSUMERD64_LIBDIR);
+static const char *consumerd32_bin = CONFIG_CONSUMERD32_BIN;
+static const char *consumerd64_bin = CONFIG_CONSUMERD64_BIN;
+static const char *consumerd32_libdir = CONFIG_CONSUMERD32_LIBDIR;
+static const char *consumerd64_libdir = CONFIG_CONSUMERD64_LIBDIR;

 
 static
 void setup_consumerd_path(void)
 
 static
 void setup_consumerd_path(void)

diff --git a/lttng-sessiond/utils.h b/lttng-sessiond/utils.h
index 7bcd1a87eb224f2eb654766f2f2b09bd6ea57510..e20ec4e9e2b5af5ed88be9d64235aeeee26f2a81 100644 (file)
--- a/lttng-sessiond/utils.h
+++ b/lttng-sessiond/utils.h
@@ -18,11 +18,6 @@
 #ifndef _LTT_UTILS_H
 #define _LTT_UTILS_H
 
 #ifndef _LTT_UTILS_H
 #define _LTT_UTILS_H
 

-#ifndef __stringify
-#define __stringify1(x)        #x
-#define __stringify(x) __stringify1(x)
-#endif
-

 const char *get_home_dir(void);
 int notify_thread_pipe(int wpipe);
 
 const char *get_home_dir(void);
 int notify_thread_pipe(int wpipe);