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 dd92eaf31e02749b2073bc72af40b996d7d3d7ad..46dc86ca7ffa9dbade74c624bef5cb9e21ed64cf 100644 (file)
--- 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 f064316186055fac620d5ee6a2dc61a892b2ddb8..c874c946d5647ee8d7ea4f90a1270464dfa6a5e6 100644 (file)
--- 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 5fe50a9f4d2e32891c154a8e9b57c153a63b504e..ad813bc2c07537009bdb4719cf3849c2a9344a8f 100644 (file)
--- 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 d4cd5942d7bed35cc0663445c6f3c713aa0a62bf..8cb44f804b368b512105151bbfa089ddeaff6b94 100644 (file)
--- 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 1b6843bf7d4879df38a57c946bd095d5cfd29f22..2bd86eb728442c2713f74cd24a30766706d731c8 100644 (file)
--- 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 (file)
index eef0d4f..0000000
--- a/share/localerr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "usterr.h"

diff --git a/ustd/lowlevel.c b/ustd/lowlevel.c
index 3509bf58799ab932d27d0618dcae002477ab5084..6a91accbb5bac43c7a55f0233fd447c473338461 100644 (file)
--- 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 6d8680ca84d2b8c91bd0e680fad43a4a9d2dc58b..fef0eae1680336dfe83eb05b8ca16b37d1d6fa39 100644 (file)
--- 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"