lttng-ctl: Hide symbol introduced by fix

Michael Jeanson noticed that f94318611 mistakenly introduces a new
public symbol in liblttng-ctl.so. This change was not intended and is
due to a bad backport of a fix initially developed against the master
branch.

The master branch (and upcoming version) of LTTng-tools is built with
the -fvisibility=hidden. Hence, the initial version of the fix had no
need to hide the utils_create_lock_file symbol.

Since the supported stable releases (2.12 and 2.13) are not built with
those options, that symbol has to be explicitly marked as hidden.

Reported-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I874538317617003eb1c58c2d3b7b0a2bdf905ef7

diff --git a/src/common/lockfile.c b/src/common/lockfile.c
index bf1ddf9e341c9f18ea3e08f4552f5fcd5c104357..048caa2d0373a268863cdcca0d8062449f78176a 100644 (file)
--- a/src/common/lockfile.c
+++ b/src/common/lockfile.c
@@ -66,6 +66,7 @@ static int lock_file(const char *filepath, int fd)
 
 #endif /* HAVE_FLOCK */
 
+LTTNG_HIDDEN
 int utils_create_lock_file(const char *filepath)
 {
        int ret, fd;

diff --git a/src/common/lockfile.h b/src/common/lockfile.h
index 1f8e01ddb3eaaadb59abeaed946d34f0f9332f2c..67bae3046d1a7e75fcda1b2fc4a5eba9832d4fd2 100644 (file)
--- a/src/common/lockfile.h
+++ b/src/common/lockfile.h
@@ -8,6 +8,8 @@
 #ifndef COMMON_LOCKFILE_H
 #define COMMON_LOCKFILE_H
 
+#include <common/macros.h>
+
 /*
  * Create lock file to the given path and filename.
  * Returns the associated file descriptor, -1 on error.
@@ -20,6 +22,7 @@
  * forks+execve as the child process closes a file descriptor referencing
  * the file description of 'filepath'.
  */
+LTTNG_HIDDEN
 int utils_create_lock_file(const char *filepath);
 
 #endif /* COMMON_LOCKFILE_H */