From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 14 Aug 2019 14:52:49 +0000 (-0400)
Subject: Cleanup: typo: overriden -> overridden
X-Git-Tag: v2.11.0-rc3~48
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d83dccf5e6795d8f21c2cda8514b44c3f1631316;p=lttng-tools.git

Cleanup: typo: overriden -> overridden

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 9c178f5fa..c90436c57 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -1698,7 +1698,7 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
 	const struct lttng_directory_handle *chunk_directory_handle;
 	int chunk_dirfd;
 	const char *chunk_name;
-	bool chunk_name_overriden;
+	bool chunk_name_overridden;
 	uint64_t chunk_id;
 	time_t creation_timestamp;
 	char creation_timestamp_buffer[ISO8601_STR_LEN];
@@ -1718,14 +1718,14 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
 	}
 
 	chunk_status = lttng_trace_chunk_get_name(chunk, &chunk_name,
-			&chunk_name_overriden);
+			&chunk_name_overridden);
 	if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK &&
 			chunk_status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
 		ERR("Failed to get name of trace chunk");
 		ret = -LTTNG_ERR_FATAL;
 		goto error;
 	}
-	if (chunk_name_overriden) {
+	if (chunk_name_overridden) {
 		ret = lttng_strncpy(msg.u.create_trace_chunk.override_name,
 				chunk_name,
 				sizeof(msg.u.create_trace_chunk.override_name));
diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 76c54a4a9..1b0a8e42a 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -1228,7 +1228,7 @@ int relayd_create_trace_chunk(struct lttcomm_relayd_sock *sock,
 	time_t creation_timestamp;
 	const char *chunk_name;
 	size_t chunk_name_length;
-	bool overriden_name;
+	bool overridden_name;
 
 	lttng_dynamic_buffer_init(&payload);
 
@@ -1246,14 +1246,14 @@ int relayd_create_trace_chunk(struct lttcomm_relayd_sock *sock,
 	}
 
 	status = lttng_trace_chunk_get_name(
-			chunk, &chunk_name, &overriden_name);
+			chunk, &chunk_name, &overridden_name);
 	if (status != LTTNG_TRACE_CHUNK_STATUS_OK &&
 			status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
 		ret = -1;
 		goto end;
 	}
 
-	chunk_name_length = overriden_name ? (strlen(chunk_name) + 1) : 0;
+	chunk_name_length = overridden_name ? (strlen(chunk_name) + 1) : 0;
 	msg = (typeof(msg)){
 		.chunk_id = htobe64(chunk_id),
 		.creation_timestamp = htobe64((uint64_t) creation_timestamp),
diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index a1be2d0a0..9e757f1fd 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -632,7 +632,7 @@ struct lttcomm_consumer_msg {
 			 * (relayd_id unset).
 			 *
 			 * `override_name` is left NULL (all-zeroes) if the
-			 * chunk's name is not overriden.
+			 * chunk's name is not overridden.
 			 */
 			LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED relayd_id;
 			char override_name[LTTNG_NAME_MAX];
diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 172bd3df8..a183fbeb0 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -77,7 +77,7 @@ struct lttng_trace_chunk {
 	struct lttng_dynamic_pointer_array top_level_directories;
 	/* Is contained within an lttng_trace_chunk_registry_element? */
 	bool in_registry_element;
-	bool name_overriden;
+	bool name_overridden;
 	char *name;
 	/* An unset id means the chunk is anonymous. */
 	LTTNG_OPTIONAL(uint64_t) id;
@@ -381,13 +381,13 @@ end:
 LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_name(
 		struct lttng_trace_chunk *chunk, const char **name,
-		bool *name_overriden)
+		bool *name_overridden)
 {
 	enum lttng_trace_chunk_status status = LTTNG_TRACE_CHUNK_STATUS_OK;
 
 	pthread_mutex_lock(&chunk->lock);
-        if (name_overriden) {
-		*name_overriden = chunk->name_overriden;
+        if (name_overridden) {
+		*name_overridden = chunk->name_overridden;
         }
         if (!chunk->name) {
 		status = LTTNG_TRACE_CHUNK_STATUS_NONE;
@@ -450,7 +450,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_override_name(
 	}
 	free(chunk->name);
 	chunk->name = new_name;
-	chunk->name_overriden = true;
+	chunk->name_overridden = true;
 end_unlock:	
 	pthread_mutex_unlock(&chunk->lock);
 end:
@@ -840,7 +840,7 @@ void lttng_trace_chunk_move_to_completed(struct lttng_trace_chunk *trace_chunk)
 	}
 
 	assert(trace_chunk->mode.value == TRACE_CHUNK_MODE_OWNER);
-	assert(!trace_chunk->name_overriden);
+	assert(!trace_chunk->name_overridden);
 
 	/*
 	 * The fist trace chunk of a session is directly output to the
diff --git a/src/common/trace-chunk.h b/src/common/trace-chunk.h
index 474e9e000..8703d0044 100644
--- a/src/common/trace-chunk.h
+++ b/src/common/trace-chunk.h
@@ -102,7 +102,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_close_timestamp(
 LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_name(
 		struct lttng_trace_chunk *chunk, const char **name,
-		bool *name_overriden);
+		bool *name_overridden);
 
 LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_override_name(