X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=e1984af5f6d68f2290c605929a0bd046a541f953;hp=1b1e65eba1327f06e90344020e490784363ec694;hb=0efb2ad7fc448283184e43d6fb0915febae45384;hpb=70987ead6fdcd00aa3365e3b4d2a6ffd5efd511f

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index 1b1e65eba..e1984af5f 100644
--- a/src/bin/lttng-sessiond/ust-registry.c
+++ b/src/bin/lttng-sessiond/ust-registry.c
@@ -149,7 +149,7 @@ static int ht_match_enum(struct cds_lfht_node *node, const void *_key)
 	assert(_enum);
 	key = _key;
 
-	if (strncmp(_enum->name, key->name, LTTNG_UST_SYM_NAME_LEN)) {
+	if (strncmp(_enum->name, key->name, LTTNG_UST_ABI_SYM_NAME_LEN)) {
 		goto no_match;
 	}
 	if (compare_enums(_enum, key)) {
@@ -584,8 +584,8 @@ struct ust_registry_enum *
 	struct ust_registry_enum reg_enum_lookup;
 
 	memset(&reg_enum_lookup, 0, sizeof(reg_enum_lookup));
-	strncpy(reg_enum_lookup.name, enum_name, LTTNG_UST_SYM_NAME_LEN);
-	reg_enum_lookup.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+	strncpy(reg_enum_lookup.name, enum_name, LTTNG_UST_ABI_SYM_NAME_LEN);
+	reg_enum_lookup.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
 	reg_enum_lookup.id = enum_id;
 	cds_lfht_lookup(session->enums->ht,
 			ht_hash_enum((void *) &reg_enum_lookup, lttng_ht_seed),
@@ -639,8 +639,8 @@ int ust_registry_create_or_find_enum(struct ust_registry_session *session,
 		ret = -ENOMEM;
 		goto end;
 	}
-	strncpy(reg_enum->name, enum_name, LTTNG_UST_SYM_NAME_LEN);
-	reg_enum->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+	strncpy(reg_enum->name, enum_name, LTTNG_UST_ABI_SYM_NAME_LEN);
+	reg_enum->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
 	/* entries will be owned by reg_enum. */
 	reg_enum->entries = entries;
 	reg_enum->nr_entries = nr_entries;
@@ -732,8 +732,8 @@ static void destroy_channel(struct ust_registry_channel *chan, bool notif)
 
 	if (notif) {
 		cmd_ret = notification_thread_command_remove_channel(
-				notification_thread_handle, chan->consumer_key,
-				LTTNG_DOMAIN_UST);
+				the_notification_thread_handle,
+				chan->consumer_key, LTTNG_DOMAIN_UST);
 		if (cmd_ret != LTTNG_OK) {
 			ERR("Failed to remove channel from notification thread");
 		}