projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: clarify `buffer_reg_channel` and `ust_registry_channel` variables
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index 35c60f8ed9344aa874f16e6b93b9660689fe64c8..cd0a4f21c5f8a2f551cba1e5a890262b7b3576a6 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-42,7
+42,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
uint64_t key, chan_reg_key;
char *pathname = NULL;
struct lttcomm_consumer_msg msg;
uint64_t key, chan_reg_key;
char *pathname = NULL;
struct lttcomm_consumer_msg msg;
- struct ust_registry_channel *
chan_reg
;
+ struct ust_registry_channel *
ust_reg_chan
;
char shm_path[PATH_MAX] = "";
char root_shm_path[PATH_MAX] = "";
bool is_local_trace;
char shm_path[PATH_MAX] = "";
char root_shm_path[PATH_MAX] = "";
bool is_local_trace;
@@
-105,9
+105,9
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
* those buffer files.
*/
} else {
* those buffer files.
*/
} else {
-
chan_reg
= ust_registry_channel_find(registry, chan_reg_key);
- assert(
chan_reg
);
- chan_id =
chan_reg
->chan_id;
+
ust_reg_chan
= ust_registry_channel_find(registry, chan_reg_key);
+ assert(
ust_reg_chan
);
+ chan_id =
ust_reg_chan
->chan_id;
if (ua_sess->shm_path[0]) {
strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path));
shm_path[sizeof(shm_path) - 1] = '\0';
if (ua_sess->shm_path[0]) {
strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path));
shm_path[sizeof(shm_path) - 1] = '\0';
This page took
0.023761 seconds
and
4
git commands to generate.