From: Jan Blunck <jblunck@suse.de>
Date: Fri, 23 Oct 2009 18:58:48 +0000 (+0200)
Subject: Remove localerr.h
X-Git-Tag: v1.9.1~847^2~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6af64c431c0a521fc927fa72b9f4015397ce11d4;p=lttng-ust.git

Remove localerr.h

localerr.h is only including usterr.h so remove it and replace it.

Signed-off-by: Jan Blunck <jblunck@suse.de>
---

diff --git a/Makefile.am b/Makefile.am
index dd92eaf3..46dc86ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork
 
-EXTRA_DIST = doc share/kernelcompat.h share/localerr.h share/share.h \
-	share/usterr.h
+EXTRA_DIST = doc share/kernelcompat.h share/share.h share/usterr.h
 dist_bin_SCRIPTS = usttrace
 
-include_HEADERS = share/kernelcompat.h share/localerr.h share/usterr.h
+include_HEADERS = share/kernelcompat.h share/usterr.h
diff --git a/libust/marker-control.c b/libust/marker-control.c
index f0643161..c874c946 100644
--- a/libust/marker-control.c
+++ b/libust/marker-control.c
@@ -36,7 +36,7 @@
 #include "kernelcompat.h"
 //#include "list.h"
 #include "tracer.h"
-#include "localerr.h"
+#include "usterr.h"
 
 #define DEFAULT_CHANNEL "cpu"
 #define DEFAULT_PROBE "default"
diff --git a/libust/marker.h b/libust/marker.h
index 5fe50a9f..ad813bc2 100644
--- a/libust/marker.h
+++ b/libust/marker.h
@@ -30,7 +30,7 @@
 //ust// #include <linux/ltt-channels.h>
 #include "kernelcompat.h"
 #include <kcompat/list.h>
-#include "localerr.h"
+#include "usterr.h"
 
 //ust// struct module;
 //ust// struct task_struct;
diff --git a/libust/tracectl.c b/libust/tracectl.c
index d4cd5942..8cb44f80 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -31,7 +31,7 @@
 
 #include "marker.h"
 #include "tracer.h"
-#include "localerr.h"
+#include "usterr.h"
 #include "ustcomm.h"
 #include "relay.h" /* FIXME: remove */
 #include "marker-control.h"
diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 1b6843bf..2bd86eb7 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -31,7 +31,7 @@
 #include <execinfo.h>
 
 #include "ustcomm.h"
-#include "localerr.h"
+#include "usterr.h"
 
 #define UNIX_PATH_MAX 108
 
diff --git a/share/localerr.h b/share/localerr.h
deleted file mode 100644
index eef0d4f0..00000000
--- a/share/localerr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "usterr.h"
diff --git a/ustd/lowlevel.c b/ustd/lowlevel.c
index 3509bf58..6a91accb 100644
--- a/ustd/lowlevel.c
+++ b/ustd/lowlevel.c
@@ -19,7 +19,7 @@
 
 #include "tracer.h"
 #include "ustd.h"
-#include "localerr.h"
+#include "usterr.h"
 
 /* This truncates to an offset in the buffer. */
 #define USTD_BUFFER_TRUNC(offset, bufinfo) \
diff --git a/ustd/ustd.c b/ustd/ustd.c
index 6d8680ca..fef0eae1 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -33,7 +33,7 @@
 #include <getopt.h>
 
 #include "ustd.h"
-#include "localerr.h"
+#include "usterr.h"
 #include "ustcomm.h"
 #include "share.h"