X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=2ee93253fe7b50f7ddfc139c58bde769465ec09c;hp=65cea55a25e73a8698fd01c2846b4a405488916a;hb=5df0f285b2f2f9903e13cf6e48046d13a6c4c727;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 65cea55a2..2ee93253f 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -26,10 +26,9 @@
 #include <config.h>
 
 #include <lttng/lttng.h>
-#include <common/lttngerr.h>
+#include <common/error.h>
 
-#include "cmd.h"
-#include "conf.h"
+#include "command.h"
 
 /* Variables */
 static char *progname;
@@ -171,15 +170,15 @@ static void sighandler(int sig)
 {
 	switch (sig) {
 		case SIGTERM:
-			DBG("SIGTERM catched");
+			DBG("SIGTERM caugth");
 			clean_exit(EXIT_FAILURE);
 			break;
 		case SIGCHLD:
 			/* Notify is done */
-			DBG("SIGCHLD catched");
+			DBG("SIGCHLD caugth");
 			break;
 		default:
-			DBG("Unknown signal %d catched", sig);
+			DBG("Unknown signal %d caugth", sig);
 			break;
 	}