Remove usterr.h, use usterr-signal-safe.h everywhere instead

Remove minimally used code.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index b77c1364cacd61655c19bd50171ea7a3fe55cf32..836cc9f3e4cf8de4c5d97317e97eb5c13c7385f7 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -25,7 +25,6 @@ nobase_include_HEADERS = \
 # note: usterr-signal-safe.h, core.h and share.h need namespace cleanup.
 
 noinst_HEADERS = \
-       usterr.h \
        usterr-signal-safe.h \
        ust_snprintf.h \
        ust-comm.h \

diff --git a/include/usterr.h b/include/usterr.h
deleted file mode 100644 (file)
index dc151b0..0000000
--- a/include/usterr.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef _USTERR_H
-#define _USTERR_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.
- *
- * 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
- */
-
-#include <string.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "lttng/ust-tid.h"
-#include "share.h"
-
-enum ust_loglevel {
-       UST_LOGLEVEL_UNKNOWN = 0,
-       UST_LOGLEVEL_NORMAL,
-       UST_LOGLEVEL_DEBUG,
-};
-
-extern volatile enum ust_loglevel ust_loglevel;
-void init_usterr(void);
-
-static inline int ust_debug(void)
-{
-       return ust_loglevel == UST_LOGLEVEL_DEBUG;
-}
-
-#ifndef UST_COMPONENT
-#define UST_COMPONENT libust
-#endif
-
-/* To stringify the expansion of a define */
-#define XSTR(d) STR(d)
-#define STR(s) #s
-
-#define UST_STR_COMPONENT XSTR(UST_COMPONENT)
-
-#define ERRMSG(fmt, args...)                                   \
-       do {                                                    \
-               fprintf(stderr, UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n",                          \
-                       (long) getpid(),                        \
-                       (long) gettid(),                        \
-                       ## args,                                \
-                       __func__);                              \
-       } while(0)
-
-#ifdef LTTNG_UST_DEBUG
-# define DBG(fmt, args...)             ERRMSG(fmt, ## args)
-# define DBG_raw(fmt, args...)                                 \
-       do {                                                    \
-                fprintf(stderr, fmt, ## args);                 \
-       } while(0)
-#else
-# define DBG(fmt, args...)                                     \
-       do {                                                    \
-               if (ust_debug())                                \
-                       ERRMSG(fmt, ## args);                   \
-       } while (0)
-# define DBG_raw(fmt, args...)                                 \
-       do {                                                    \
-               if (ust_debug()) {                              \
-                       fprintf(stderr, fmt, ## args);          \
-               }                                               \
-       } while(0)
-#endif
-
-#define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
-#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))
-/*
- * Version using XSI strerror_r.
- */
-#define PERROR(call, args...)\
-       do { \
-               char buf[200] = "Error in strerror_r()"; \
-               strerror_r(errno, buf, sizeof(buf)); \
-               ERRMSG("Error: " call ": %s", ## args, buf); \
-       } while(0);
-#else
-/*
- * Version using GNU strerror_r, for linux with appropriate defines.
- */
-#define PERROR(call, args...)\
-       do { \
-               char *buf; \
-               char tmp[200]; \
-               buf = strerror_r(errno, tmp, sizeof(tmp)); \
-               ERRMSG("Error: " call ": %s", ## args, buf); \
-       } while(0);
-#endif
-
-#define BUG_ON(condition)                                      \
-       do {                                                    \
-               if (caa_unlikely(condition))                    \
-                       ERR("condition not respected (BUG) on line %s:%d", __FILE__, __LINE__); \
-       } while(0)
-#define WARN_ON(condition)                                     \
-       do {                                                    \
-               if (caa_unlikely(condition))                    \
-                       WARN("condition not respected on line %s:%d", __FILE__, __LINE__); \
-       } while(0)
-#define WARN_ON_ONCE(condition) WARN_ON(condition)
-
-#endif /* _USTERR_H */

diff --git a/liblttng-ust-dl/ustdl.c b/liblttng-ust-dl/ustdl.c
index b6abca7b6e13c7562bbb4d1b8fccbcaea64bdf2b..1ef84c372f43ccc102f3e16892ffe048798d126f 100644 (file)
--- a/liblttng-ust-dl/ustdl.c
+++ b/liblttng-ust-dl/ustdl.c
@@ -29,7 +29,7 @@
 #include <signal.h>
 #include <sched.h>
 #include <stdarg.h>
-#include "usterr.h"
+#include "usterr-signal-safe.h"
 
 #include <lttng/ust-compiler.h>
 #include <lttng/ust.h>

diff --git a/liblttng-ust-fork/ustfork.c b/liblttng-ust-fork/ustfork.c
index e14296011e8232d23448afd4f1c5839c69cf1446..43b8d8f69a39e3683f59a02d1a4db76b990df3f2 100644 (file)
--- a/liblttng-ust-fork/ustfork.c
+++ b/liblttng-ust-fork/ustfork.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 #include <sched.h>
 #include <stdarg.h>
-#include "usterr.h"
+#include <errno.h>
 
 #include <lttng/ust.h>
 

diff --git a/libringbuffer/smp.c b/libringbuffer/smp.c
index 410e4c1890cb1f5d885cfcba63f45b4c449cfeb3..ffc7a52a180a42af05270979e222b2558a6c288c 100644 (file)
--- a/libringbuffer/smp.c
+++ b/libringbuffer/smp.c
@@ -20,7 +20,6 @@
 
 #define _GNU_SOURCE
 #include <unistd.h>
-#include "usterr.h"
 #include <pthread.h>
 #include "smp.h"