X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ffd-tracker%2Futils.c;h=fc307fea9e84ca5ef25aa84d2e09edef2084dd42;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=fe2cdcc4ed4f84f1c629e27c630964d25d10f377;hpb=dd95933f8371a8c81ffc1dc5b306f2263f1ff808;p=lttng-tools.git diff --git a/src/common/fd-tracker/utils.c b/src/common/fd-tracker/utils.c index fe2cdcc4e..fc307fea9 100644 --- a/src/common/fd-tracker/utils.c +++ b/src/common/fd-tracker/utils.c @@ -27,13 +27,11 @@ int close_pipe(void *data, int *pipe) return 0; } -LTTNG_HIDDEN int fd_tracker_util_close_fd(void *unused, int *fd) { return close(*fd); } -LTTNG_HIDDEN int fd_tracker_util_pipe_open_cloexec( struct fd_tracker *tracker, const char *name, int *pipe) { @@ -59,7 +57,6 @@ end: return ret; } -LTTNG_HIDDEN int fd_tracker_util_pipe_close(struct fd_tracker *tracker, int *pipe) { return fd_tracker_close_unsuspendable_fd( @@ -101,7 +98,7 @@ int open_directory_handle(void *_args, int *out_fds) if (!lttng_directory_handle_uses_fd(new_handle)) { ret = ENOTSUP; } else { -#ifdef COMPAT_DIRFD +#ifdef HAVE_DIRFD *out_fds = new_handle->dirfd; #else abort(); @@ -112,7 +109,7 @@ end: return ret; } -#ifdef COMPAT_DIRFD +#ifdef HAVE_DIRFD static int fd_close(void *unused, int *in_fds) { @@ -136,7 +133,6 @@ void directory_handle_destroy( } #endif -LTTNG_HIDDEN struct lttng_directory_handle *fd_tracker_create_directory_handle( struct fd_tracker *tracker, const char *path) { @@ -144,7 +140,6 @@ struct lttng_directory_handle *fd_tracker_create_directory_handle( tracker, NULL, path); } -LTTNG_HIDDEN struct lttng_directory_handle *fd_tracker_create_directory_handle_from_handle( struct fd_tracker *tracker, struct lttng_directory_handle *in_handle, @@ -182,7 +177,7 @@ struct lttng_directory_handle *fd_tracker_create_directory_handle_from_handle( } new_handle = open_args.ret_handle; -#ifdef COMPAT_DIRFD +#ifdef HAVE_DIRFD new_handle->destroy_cb = directory_handle_destroy; new_handle->destroy_cb_data = tracker; #endif