Hide private share.h symbols

[lttng-ust.git] / include / usterr-signal-safe.h

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index 1df5ada0ff2ec290d4eb5f53a15836a5bb7cb454..9ce6ad83c5aff667e80ba4f9f2cb9f7ca1614533 100644 (file)
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -1,32 +1,20 @@
-#ifndef _USTERR_SIGNAL_SAFE_H
-#define _USTERR_SIGNAL_SAFE_H
-
 /*
- * Copyright (C) 2009  Pierre-Marc Fournier
- * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1 of
- * the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#ifndef _USTERR_SIGNAL_SAFE_H
+#define _USTERR_SIGNAL_SAFE_H
+
 #include <string.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <share.h>
-#include "lttng/ust-tid.h"
+#include <ust-share.h>
+#include "ust-tid.h"
 
 enum ust_loglevel {
        UST_LOGLEVEL_UNKNOWN = 0,
@@ -67,11 +55,6 @@ static inline int ust_debug(void)
 extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...)
        __attribute__ ((format (printf, 3, 4)));
 
-static inline void __attribute__ ((format (printf, 1, 2)))
-       __check_ust_safe_fmt(const char *fmt, ...)
-{
-}
-
 /* Can't use dynamic allocation. Limit ourselves to USTERR_MAX_LEN chars. */
 /* Add end of string in case of buffer overflow. */
 #define sigsafe_print_err(fmt, args...)                                        \
@@ -83,7 +66,7 @@ do {                                                                  \
                ____saved_errno = errno;        /* signal-safety */     \
                ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
                ____buf[sizeof(____buf) - 1] = 0;                       \
-               patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
+               ust_patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
                errno = ____saved_errno;        /* signal-safety */     \
                fflush(stderr);                                         \
        }                                                               \
@@ -95,7 +78,7 @@ do {                                                                  \
        do {                                    \
                sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" UST_XSTR(__LINE__) ")\n", \
                (long) getpid(),                \
-               (long) gettid(),                \
+               (long) lttng_gettid(),          \
                ## args, __func__);             \
        } while(0)