X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl-health.cpp;h=4821548e515c032a636b9d765f9e42429403cd33;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=2a992830d5a41209cb99c162b71c6d2a4e38f57c;hpb=4bd69c5f1161cd065f487da0f4c1aa03a73c47e4;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl-health.cpp b/src/lib/lttng-ctl/lttng-ctl-health.cpp
index 2a992830d..4821548e5 100644
--- a/src/lib/lttng-ctl/lttng-ctl-health.cpp
+++ b/src/lib/lttng-ctl/lttng-ctl-health.cpp
@@ -3,7 +3,7 @@
  *
  * Linux Trace Toolkit Health Control Library
  *
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * SPDX-License-Identifier: LGPL-2.1-only
@@ -16,16 +16,16 @@
 #include <stdint.h>
 #include <limits.h>
 #include <string.h>
-#include <lttng/health-internal.h>
+#include <lttng/health-internal.hpp>
 
-#include <bin/lttng-sessiond/health-sessiond.h>
-#include <bin/lttng-consumerd/health-consumerd.h>
-#include <bin/lttng-relayd/health-relayd.h>
-#include <common/defaults.h>
-#include <common/utils.h>
-#include <common/compat/errno.h>
+#include <bin/lttng-sessiond/health-sessiond.hpp>
+#include <bin/lttng-consumerd/health-consumerd.hpp>
+#include <bin/lttng-relayd/health-relayd.hpp>
+#include <common/defaults.hpp>
+#include <common/utils.hpp>
+#include <common/compat/errno.hpp>
 
-#include "lttng-ctl-helper.h"
+#include "lttng-ctl-helper.hpp"
 
 enum health_component {
 	HEALTH_COMPONENT_SESSIOND,
@@ -64,8 +64,6 @@ const char *get_sessiond_thread_name(health_type_sessiond type) {
 		return "Session daemon kernel";
 	case HEALTH_SESSIOND_TYPE_CONSUMER:
 		return "Session daemon consumer manager";
-	case HEALTH_SESSIOND_TYPE_HT_CLEANUP:
-		return "Session daemon hash table cleanup";
 	case HEALTH_SESSIOND_TYPE_APP_MANAGE_NOTIFY:
 		return "Session daemon application notification manager";
 	case HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH:
@@ -214,8 +212,11 @@ int set_health_socket_path(struct lttng_health *lh,
 		home = "/tmp";
 	}
 
+	DIAGNOSTIC_PUSH
+	DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL
 	ret = snprintf(lh->health_sock_path, sizeof(lh->health_sock_path),
 			home_str, home);
+	DIAGNOSTIC_POP
 	if ((ret < 0) || (ret >= sizeof(lh->health_sock_path))) {
 		return -ENOMEM;
 	}