From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 17 Aug 2018 17:25:33 +0000 (-0400)
Subject: Cleanup: remove superfluous argument to consumed size create
X-Git-Tag: v2.11.0-rc1~132
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5f2c1c0ff0173e7ce9a6528d6129563d24687325;p=lttng-tools.git

Cleanup: remove superfluous argument to consumed size create
---

diff --git a/include/lttng/condition/session-consumed-size-internal.h b/include/lttng/condition/session-consumed-size-internal.h
index e2a741ecb..65ac70668 100644
--- a/include/lttng/condition/session-consumed-size-internal.h
+++ b/include/lttng/condition/session-consumed-size-internal.h
@@ -50,7 +50,7 @@ struct lttng_evaluation_session_consumed_size_comm {
 
 LTTNG_HIDDEN
 struct lttng_evaluation *lttng_evaluation_session_consumed_size_create(
-		enum lttng_condition_type type, uint64_t consumed);
+		uint64_t consumed);
 
 LTTNG_HIDDEN
 ssize_t lttng_condition_session_consumed_size_create_from_buffer(
diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 33876874b..e915b33b5 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2344,7 +2344,6 @@ int evaluate_condition(const struct lttng_condition *condition,
 		break;
 	case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
 		*evaluation = lttng_evaluation_session_consumed_size_create(
-				condition_type,
 				latest_session_consumed_total);
 		break;
 	default:
diff --git a/src/common/session-consumed-size.c b/src/common/session-consumed-size.c
index f29176f8d..6ff1c2486 100644
--- a/src/common/session-consumed-size.c
+++ b/src/common/session-consumed-size.c
@@ -258,7 +258,6 @@ error:
 
 static
 struct lttng_evaluation *create_evaluation_from_buffer(
-		enum lttng_condition_type type,
 		const struct lttng_buffer_view *view)
 {
 	const struct lttng_evaluation_session_consumed_size_comm *comm =
@@ -269,7 +268,7 @@ struct lttng_evaluation *create_evaluation_from_buffer(
 		goto end;
 	}
 
-	evaluation = lttng_evaluation_session_consumed_size_create(type,
+	evaluation = lttng_evaluation_session_consumed_size_create(
 			comm->session_consumed);
 end:
 	return evaluation;
@@ -288,8 +287,7 @@ ssize_t lttng_evaluation_session_consumed_size_create_from_buffer(
 		goto error;
 	}
 
-	evaluation = create_evaluation_from_buffer(
-			LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE, view);
+	evaluation = create_evaluation_from_buffer(view);
 	if (!evaluation) {
 		ret = -1;
 		goto error;
@@ -428,7 +426,7 @@ void lttng_evaluation_session_consumed_size_destroy(
 
 LTTNG_HIDDEN
 struct lttng_evaluation *lttng_evaluation_session_consumed_size_create(
-		enum lttng_condition_type type, uint64_t consumed)
+		uint64_t consumed)
 {
 	struct lttng_evaluation_session_consumed_size *consumed_eval;
 
@@ -437,7 +435,7 @@ struct lttng_evaluation *lttng_evaluation_session_consumed_size_create(
 		goto end;
 	}
 
-	consumed_eval->parent.type = type;
+	consumed_eval->parent.type = LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE;
 	consumed_eval->session_consumed = consumed;
 	consumed_eval->parent.serialize = lttng_evaluation_session_consumed_size_serialize;
 	consumed_eval->parent.destroy = lttng_evaluation_session_consumed_size_destroy;