X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fusterr-signal-safe.h;h=3d6756872fd6943a18ca83149bde06349fb084c8;hb=e88c7263a3440484b3968f6abc314efd40f0c3f4;hp=bc68fbf4b2f81a5fc76bc67d492903cbe6f4eb64;hpb=7bdd21a41092a59207958911666cbd458f93a319;p=lttng-ust.git

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index bc68fbf4..3d675687 100644
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -1,32 +1,21 @@
-#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>
- *
- * 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.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * 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"
+#include "ust-snprintf.h"
 
 enum ust_loglevel {
 	UST_LOGLEVEL_UNKNOWN = 0,
@@ -63,15 +52,6 @@ static inline int ust_debug(void)
 /* We sometimes print in the tracing path, and tracing can occur in
  * signal handlers, so we must use a print method which is signal safe.
  */
-
-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 +63,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 +75,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)
 
@@ -106,7 +86,7 @@ do {									\
 #define ERR(fmt, args...)	ERRMSG("Error: " fmt, ## args)
 #define BUG(fmt, args...)	ERRMSG("BUG: " fmt, ## args)
 
-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
 /*
  * Version using XSI strerror_r.
  */