X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.cpp;h=b4d3c00a498b2644d34c7b7bccdf9a26d1ee2938;hb=dcd24bbf7dbc74e3584d1d0d52715e749023c452;hp=20b2232888195296fd0f279ba41ab17238a0ae6b;hpb=3c3390532736cfb5198f863d0d2b218e21fcf76d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/utils.cpp b/src/bin/lttng-sessiond/utils.cpp
index 20b223288..b4d3c00a4 100644
--- a/src/bin/lttng-sessiond/utils.cpp
+++ b/src/bin/lttng-sessiond/utils.cpp
@@ -7,14 +7,14 @@
  */
 
 #define _LGPL_SOURCE
-#include <stdlib.h>
-#include <unistd.h>
+#include "lttng-sessiond.hpp"
+#include "snapshot.hpp"
+#include "utils.hpp"
 
-#include <common/error.h>
+#include <common/error.hpp>
 
-#include "utils.h"
-#include "snapshot.h"
-#include "lttng-sessiond.h"
+#include <stdlib.h>
+#include <unistd.h>
 
 /*
  * Write to writable pipe used to notify a thread.
@@ -30,14 +30,18 @@ int notify_thread_pipe(int wpipe)
 
 	ret = lttng_write(wpipe, "!", 1);
 	if (ret < 1) {
-		PERROR("write poll pipe");
+		ret = -1;
+		PERROR("Failed to write to thread pipe");
 	}
 
 	return (int) ret;
 }
 
-int loglevels_match(int a_loglevel_type, int a_loglevel_value,
-	int b_loglevel_type, int b_loglevel_value, int loglevel_all_type)
+int loglevels_match(int a_loglevel_type,
+		    int a_loglevel_value,
+		    int b_loglevel_type,
+		    int b_loglevel_value,
+		    int loglevel_all_type)
 {
 	int match = 1;
 
@@ -67,7 +71,6 @@ const char *session_get_base_path(const struct ltt_session *session)
 
 const char *consumer_output_get_base_path(const struct consumer_output *output)
 {
-	return output->type == CONSUMER_DST_LOCAL ?
-			output->dst.session_root_path :
-			output->dst.net.base_dir;
+	return output->type == CONSUMER_DST_LOCAL ? output->dst.session_root_path :
+						    output->dst.net.base_dir;
 }