Clean-up: lttng: prepend `the_` to global variables in list.c

This avoids name clashes between the global variable `handle` and
function parameters of the same name. Change all global variables of the
file while at it.

Change-Id: Ice1a4f98270f439f5e5001014d9b3d6f2d8a5803
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 4540177941faf9e30f610caf448ff6728c486a45..8151886082857a383f93e3d8d9ae72b69eae7bd4 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -48,11 +48,11 @@ enum {
        OPT_LIST_OPTIONS,
 };
 
-static struct lttng_handle *handle;
-static struct mi_writer *writer;
+static struct lttng_handle *the_handle;
+static struct mi_writer *the_writer;
 
 /* Only set when listing a single session. */
-static struct lttng_session listed_session;
+static struct lttng_session the_listed_session;
 
 static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
@@ -358,14 +358,16 @@ static void print_events(struct lttng_event *event)
        {
                if (event->loglevel != -1) {
                        MSG("%s%s (loglevel%s %s (%d)) (type: tracepoint)%s%s%s",
-                               indent6,
-                               event->name,
-                               logleveltype_string(event->loglevel_type),
-                               mi_lttng_loglevel_string(event->loglevel, handle->domain.type),
-                               event->loglevel,
-                               enabled_string(event->enabled),
-                               safe_string(exclusion_msg),
-                               safe_string(filter_msg));
+                                       indent6, event->name,
+                                       logleveltype_string(
+                                                       event->loglevel_type),
+                                       mi_lttng_loglevel_string(
+                                                       event->loglevel,
+                                                       the_handle->domain.type),
+                                       event->loglevel,
+                                       enabled_string(event->enabled),
+                                       safe_string(exclusion_msg),
+                                       safe_string(filter_msg));
                } else {
                        MSG("%s%s (type: tracepoint)%s%s%s",
                                indent6,
@@ -473,19 +475,19 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
        int pid_element_open = 0;
 
        /* Open domains element */
-       ret = mi_lttng_domains_open(writer);
+       ret = mi_lttng_domains_open(the_writer);
        if (ret) {
                goto end;
        }
 
        /* Write domain */
-       ret = mi_lttng_domain(writer, domain, 1);
+       ret = mi_lttng_domain(the_writer, domain, 1);
        if (ret) {
                goto end;
        }
 
        /* Open pids element element */
-       ret = mi_lttng_pids_open(writer);
+       ret = mi_lttng_pids_open(the_writer);
        if (ret) {
                goto end;
        }
@@ -494,7 +496,8 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
                if (cur_pid != events[i].pid) {
                        if (pid_element_open) {
                                /* Close the previous events and pid element */
-                               ret = mi_lttng_close_multi_element(writer, 2);
+                               ret = mi_lttng_close_multi_element(
+                                               the_writer, 2);
                                if (ret) {
                                        goto end;
                                }
@@ -510,13 +513,14 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 
                        if (!pid_element_open) {
                                /* Open and write a pid element */
-                               ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
+                               ret = mi_lttng_pid(the_writer, cur_pid, cmdline,
+                                               1);
                                if (ret) {
                                        goto error;
                                }
 
                                /* Open events element */
-                               ret = mi_lttng_events_open(writer);
+                               ret = mi_lttng_events_open(the_writer);
                                if (ret) {
                                        goto error;
                                }
@@ -527,20 +531,21 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
                }
 
                /* Write an event */
-               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
+               ret = mi_lttng_event(the_writer, &events[i], 0,
+                               the_handle->domain.type);
                if (ret) {
                        goto end;
                }
        }
 
        /* Close pids */
-       ret = mi_lttng_writer_close_element(writer);
+       ret = mi_lttng_writer_close_element(the_writer);
        if (ret) {
                goto end;
        }
 
        /* Close domain, domains */
-       ret = mi_lttng_close_multi_element(writer, 2);
+       ret = mi_lttng_close_multi_element(the_writer, 2);
 end:
        return ret;
 error:
@@ -712,19 +717,19 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
        memset(&cur_event, 0, sizeof(cur_event));
 
        /* Open domains element */
-       ret = mi_lttng_domains_open(writer);
+       ret = mi_lttng_domains_open(the_writer);
        if (ret) {
                goto end;
        }
 
        /* Write domain */
-       ret = mi_lttng_domain(writer, domain, 1);
+       ret = mi_lttng_domain(the_writer, domain, 1);
        if (ret) {
                goto end;
        }
 
        /* Open pids element */
-       ret = mi_lttng_pids_open(writer);
+       ret = mi_lttng_pids_open(the_writer);
        if (ret) {
                goto end;
        }
@@ -734,14 +739,16 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
                        if (pid_element_open) {
                                if (event_element_open) {
                                        /* Close the previous field element and event. */
-                                       ret = mi_lttng_close_multi_element(writer, 2);
+                                       ret = mi_lttng_close_multi_element(
+                                                       the_writer, 2);
                                        if (ret) {
                                                goto end;
                                        }
                                        event_element_open = 0;
                                }
                                /* Close the previous events, pid element */
-                               ret = mi_lttng_close_multi_element(writer, 2);
+                               ret = mi_lttng_close_multi_element(
+                                               the_writer, 2);
                                if (ret) {
                                        goto end;
                                }
@@ -752,13 +759,14 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
                        cmdline = get_cmdline_by_pid(cur_pid);
                        if (!pid_element_open) {
                                /* Open and write a pid element */
-                               ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
+                               ret = mi_lttng_pid(the_writer, cur_pid, cmdline,
+                                               1);
                                if (ret) {
                                        goto error;
                                }
 
                                /* Open events element */
-                               ret = mi_lttng_events_open(writer);
+                               ret = mi_lttng_events_open(the_writer);
                                if (ret) {
                                        goto error;
                                }
@@ -772,7 +780,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
                if (strcmp(cur_event.name, fields[i].event.name) != 0) {
                        if (event_element_open) {
                                /* Close the previous fields element and the previous event */
-                               ret = mi_lttng_close_multi_element(writer, 2);
+                               ret = mi_lttng_close_multi_element(
+                                               the_writer, 2);
                                if (ret) {
                                        goto end;
                                }
@@ -784,14 +793,14 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 
                        if (!event_element_open) {
                                /* Open and write the event */
-                               ret = mi_lttng_event(writer, &cur_event, 1,
-                                               handle->domain.type);
+                               ret = mi_lttng_event(the_writer, &cur_event, 1,
+                                               the_handle->domain.type);
                                if (ret) {
                                        goto end;
                                }
 
                                /* Open a fields element */
-                               ret = mi_lttng_event_fields_open(writer);
+                               ret = mi_lttng_event_fields_open(the_writer);
                                if (ret) {
                                        goto end;
                                }
@@ -800,14 +809,14 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
                }
 
                /* Print the event_field */
-               ret = mi_lttng_event_field(writer, &fields[i]);
+               ret = mi_lttng_event_field(the_writer, &fields[i]);
                if (ret) {
                        goto end;
                }
        }
 
        /* Close pids, domain, domains */
-       ret = mi_lttng_close_multi_element(writer, 3);
+       ret = mi_lttng_close_multi_element(the_writer, 3);
 end:
        return ret;
 error:
@@ -905,32 +914,33 @@ static int mi_list_kernel_events(struct lttng_event *events, int count,
        int ret, i;
 
        /* Open domains element */
-       ret = mi_lttng_domains_open(writer);
+       ret = mi_lttng_domains_open(the_writer);
        if (ret) {
                goto end;
        }
 
        /* Write domain */
-       ret = mi_lttng_domain(writer, domain, 1);
+       ret = mi_lttng_domain(the_writer, domain, 1);
        if (ret) {
                goto end;
        }
 
        /* Open events */
-       ret = mi_lttng_events_open(writer);
+       ret = mi_lttng_events_open(the_writer);
        if (ret) {
                goto end;
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
+               ret = mi_lttng_event(the_writer, &events[i], 0,
+                               the_handle->domain.type);
                if (ret) {
                        goto end;
                }
        }
 
        /* close events, domain and domains */
-       ret = mi_lttng_close_multi_element(writer, 3);
+       ret = mi_lttng_close_multi_element(the_writer, 3);
        if (ret) {
                goto end;
        }
@@ -1005,20 +1015,21 @@ static int mi_list_syscalls(struct lttng_event *events, int count)
        int ret, i;
 
        /* Open events */
-       ret = mi_lttng_events_open(writer);
+       ret = mi_lttng_events_open(the_writer);
        if (ret) {
                goto end;
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
+               ret = mi_lttng_event(the_writer, &events[i], 0,
+                               the_handle->domain.type);
                if (ret) {
                        goto end;
                }
        }
 
        /* Close events. */
-       ret = mi_lttng_writer_close_element(writer);
+       ret = mi_lttng_writer_close_element(the_writer);
        if (ret) {
                goto end;
        }
@@ -1078,20 +1089,21 @@ static int mi_list_session_agent_events(struct lttng_event *events, int count)
        int ret, i;
 
        /* Open events element */
-       ret = mi_lttng_events_open(writer);
+       ret = mi_lttng_events_open(the_writer);
        if (ret) {
                goto end;
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
+               ret = mi_lttng_event(the_writer, &events[i], 0,
+                               the_handle->domain.type);
                if (ret) {
                        goto end;
                }
        }
 
        /* Close events element */
-       ret = mi_lttng_writer_close_element(writer);
+       ret = mi_lttng_writer_close_element(the_writer);
 
 end:
        return ret;
@@ -1107,7 +1119,7 @@ static int list_session_agent_events(void)
        int ret = CMD_SUCCESS, count, i;
        struct lttng_event *events = NULL;
 
-       count = lttng_list_events(handle, "", &events);
+       count = lttng_list_events(the_handle, "", &events);
        if (count < 0) {
                ret = CMD_ERROR;
                ERR("%s", lttng_strerror(count));
@@ -1156,10 +1168,11 @@ static int list_session_agent_events(void)
                                                event->name,
                                                enabled_string(event->enabled),
                                                logleveltype_string(
-                                                       event->loglevel_type),
+                                                               event->loglevel_type),
                                                mi_lttng_loglevel_string(
-                                                       event->loglevel,
-                                                       handle->domain.type),
+                                                               event->loglevel,
+                                                               the_handle->domain
+                                                                               .type),
                                                safe_string(filter_msg));
                        } else {
                                MSG("%s- %s%s%s", indent4, event->name,
@@ -1187,20 +1200,21 @@ static int mi_list_events(struct lttng_event *events, int count)
        int ret, i;
 
        /* Open events element */
-       ret = mi_lttng_events_open(writer);
+       ret = mi_lttng_events_open(the_writer);
        if (ret) {
                goto end;
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
+               ret = mi_lttng_event(the_writer, &events[i], 0,
+                               the_handle->domain.type);
                if (ret) {
                        goto end;
                }
        }
 
        /* Close events element */
-       ret = mi_lttng_writer_close_element(writer);
+       ret = mi_lttng_writer_close_element(the_writer);
 
 end:
        return ret;
@@ -1214,7 +1228,7 @@ static int list_events(const char *channel_name)
        int ret = CMD_SUCCESS, count, i;
        struct lttng_event *events = NULL;
 
-       count = lttng_list_events(handle, channel_name, &events);
+       count = lttng_list_events(the_handle, channel_name, &events);
        if (count < 0) {
                ret = CMD_ERROR;
                ERR("%s", lttng_strerror(count));
@@ -1340,7 +1354,7 @@ static void print_channel(struct lttng_channel *channel)
        }
 
        MSG("\n%sStatistics:", indent4);
-       if (listed_session.snapshot_mode) {
+       if (the_listed_session.snapshot_mode) {
                /*
                 * The lost packet count is omitted for sessions in snapshot
                 * mode as it is misleading: it would indicate the number of
@@ -1379,7 +1393,7 @@ static int mi_list_channels(struct lttng_channel *channels, int count,
        unsigned int chan_found = 0;
 
        /* Open channels element */
-       ret = mi_lttng_channels_open(writer);
+       ret = mi_lttng_channels_open(the_writer);
        if (ret) {
                goto error;
        }
@@ -1394,7 +1408,7 @@ static int mi_list_channels(struct lttng_channel *channels, int count,
                }
 
                /* Write channel element  and leave it open */
-               ret = mi_lttng_channel(writer, &channels[i], 1);
+               ret = mi_lttng_channel(the_writer, &channels[i], 1);
                if (ret) {
                        goto error;
                }
@@ -1406,7 +1420,7 @@ static int mi_list_channels(struct lttng_channel *channels, int count,
                }
 
                /* Closing the channel element we opened earlier */
-               ret = mi_lttng_writer_close_element(writer);
+               ret = mi_lttng_writer_close_element(the_writer);
                if (ret) {
                        goto error;
                }
@@ -1417,7 +1431,7 @@ static int mi_list_channels(struct lttng_channel *channels, int count,
        }
 
        /* Close channels element */
-       ret = mi_lttng_writer_close_element(writer);
+       ret = mi_lttng_writer_close_element(the_writer);
        if (ret) {
                goto error;
        }
@@ -1439,7 +1453,7 @@ static int list_channels(const char *channel_name)
 
        DBG("Listing channel(s) (%s)", channel_name ? : "<all>");
 
-       count = lttng_list_channels(handle, &channels);
+       count = lttng_list_channels(the_handle, &channels);
        if (count < 0) {
                switch (-count) {
                case LTTNG_ERR_KERN_CHAN_NOT_FOUND:
@@ -1547,7 +1561,7 @@ static int handle_process_attr_status(enum lttng_process_attr process_attr,
        case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_SESSION_DOES_NOT_EXIST:
                ERR("Failed to get the inclusion set of the %s tracker: session `%s` no longer exists",
                                lttng_process_attr_to_string(process_attr),
-                               handle->session_name);
+                               the_handle->session_name);
                ret = CMD_ERROR;
                break;
        default:
@@ -1564,12 +1578,12 @@ static int mi_output_empty_tracker(enum lttng_process_attr process_attr)
 {
        int ret;
 
-       ret = mi_lttng_process_attribute_tracker_open(writer, process_attr);
+       ret = mi_lttng_process_attribute_tracker_open(the_writer, process_attr);
        if (ret) {
                goto end;
        }
 
-       ret = mi_lttng_close_multi_element(writer, 2);
+       ret = mi_lttng_close_multi_element(the_writer, 2);
 end:
        return ret;
 }
@@ -1595,8 +1609,8 @@ static int list_process_attr_tracker(enum lttng_process_attr process_attr)
        const struct lttng_process_attr_values *values;
        struct lttng_process_attr_tracker_handle *tracker_handle = NULL;
 
-       ret_code = lttng_session_get_tracker_handle(handle->session_name,
-                       handle->domain.type, process_attr, &tracker_handle);
+       ret_code = lttng_session_get_tracker_handle(the_handle->session_name,
+                       the_handle->domain.type, process_attr, &tracker_handle);
        if (ret_code != LTTNG_OK) {
                ERR("Failed to get process attribute tracker handle: %s",
                                lttng_strerror(ret_code));
@@ -1634,7 +1648,7 @@ static int list_process_attr_tracker(enum lttng_process_attr process_attr)
        case LTTNG_TRACKING_POLICY_INCLUDE_SET:
                break;
        case LTTNG_TRACKING_POLICY_EXCLUDE_ALL:
-               if (writer) {
+               if (the_writer) {
                        mi_output_empty_tracker(process_attr);
                }
                MSG("none");
@@ -1647,7 +1661,7 @@ static int list_process_attr_tracker(enum lttng_process_attr process_attr)
        default:
                ERR("Unknown tracking policy encoutered while listing the %s process attribute tracker of session `%s`",
                                lttng_process_attr_to_string(process_attr),
-                               handle->session_name);
+                               the_handle->session_name);
                ret = CMD_FATAL;
                goto end;
        }
@@ -1656,14 +1670,14 @@ static int list_process_attr_tracker(enum lttng_process_attr process_attr)
        if (values_status != LTTNG_PROCESS_ATTR_VALUES_STATUS_OK) {
                ERR("Failed to get the count of values in the inclusion set of the %s process attribute tracker of session `%s`",
                                lttng_process_attr_to_string(process_attr),
-                               handle->session_name);
+                               the_handle->session_name);
                ret = CMD_FATAL;
                goto end;
        }
 
        if (count == 0) {
                /* Functionally equivalent to the 'exclude all' policy. */
-               if (writer) {
+               if (the_writer) {
                        mi_output_empty_tracker(process_attr);
                }
                MSG("none");
@@ -1672,10 +1686,10 @@ static int list_process_attr_tracker(enum lttng_process_attr process_attr)
        }
 
        /* Mi tracker_id element */
-       if (writer) {
+       if (the_writer) {
                /* Open tracker_id and targets elements */
                ret = mi_lttng_process_attribute_tracker_open(
-                               writer, process_attr);
+                               the_writer, process_attr);
                if (ret) {
                        goto end;
                }
@@ -1749,17 +1763,16 @@ static int list_process_attr_tracker(enum lttng_process_attr process_attr)
                }
 
                /* Mi */
-               if (writer) {
+               if (the_writer) {
                        ret = is_value_type_name(value_type) ?
                                              mi_lttng_string_process_attribute_value(
-                                                             writer,
-                                                             process_attr,
-                                                             name, false) :
+                                                       the_writer,
+                                                       process_attr, name,
+                                                       false) :
                                              mi_lttng_integral_process_attribute_value(
-                                                             writer,
-                                                             process_attr,
-                                                             integral_value,
-                                                             false);
+                                                       the_writer,
+                                                       process_attr,
+                                                       integral_value, false);
                        if (ret) {
                                goto end;
                        }
@@ -1768,8 +1781,8 @@ static int list_process_attr_tracker(enum lttng_process_attr process_attr)
        MSG("");
 
        /* Mi close tracker_id and targets */
-       if (writer) {
-               ret = mi_lttng_close_multi_element(writer, 2);
+       if (the_writer) {
+               ret = mi_lttng_close_multi_element(the_writer, 2);
                if (ret) {
                        goto end;
                }
@@ -1789,7 +1802,7 @@ static int list_trackers(const struct lttng_domain *domain)
        MSG("Tracked process attributes");
        /* Trackers listing */
        if (lttng_opt_mi) {
-               ret = mi_lttng_trackers_open(writer);
+               ret = mi_lttng_trackers_open(the_writer);
                if (ret) {
                        goto end;
                }
@@ -1857,7 +1870,7 @@ static int list_trackers(const struct lttng_domain *domain)
        MSG();
        if (lttng_opt_mi) {
                /* Close trackers element */
-               ret = mi_lttng_writer_close_element(writer);
+               ret = mi_lttng_writer_close_element(the_writer);
                if (ret) {
                        goto end;
                }
@@ -1959,7 +1972,7 @@ static enum cmd_error_code list_rotate_settings(const char *session_name)
 
        MSG("Automatic rotation schedules:");
        if (lttng_opt_mi) {
-               ret = mi_lttng_writer_open_element(writer,
+               ret = mi_lttng_writer_open_element(the_writer,
                                mi_lttng_element_rotation_schedules);
                if (ret) {
                        cmd_ret = CMD_ERROR;
@@ -1979,7 +1992,7 @@ static enum cmd_error_code list_rotate_settings(const char *session_name)
                }
 
                if (lttng_opt_mi) {
-                       ret = mi_lttng_rotation_schedule(writer, schedule);
+                       ret = mi_lttng_rotation_schedule(the_writer, schedule);
                        if (ret) {
                                tmp_ret = CMD_ERROR;
                        }
@@ -1997,7 +2010,7 @@ static enum cmd_error_code list_rotate_settings(const char *session_name)
        _MSG("\n");
        if (lttng_opt_mi) {
                /* Close the rotation_schedules element. */
-               ret = mi_lttng_writer_close_element(writer);
+               ret = mi_lttng_writer_close_element(the_writer);
                if (ret) {
                        cmd_ret = CMD_ERROR;
                        goto end;
@@ -2029,7 +2042,7 @@ static int mi_list_session(const char *session_name,
                        /* We need to leave it open to append other informations
                         * like domain, channel, events etc.*/
                        session_found = 1;
-                       ret = mi_lttng_session(writer, &sessions[i], 1);
+                       ret = mi_lttng_session(the_writer, &sessions[i], 1);
                        if (ret) {
                                goto end;
                        }
@@ -2056,21 +2069,21 @@ static int mi_list_sessions(struct lttng_session *sessions, int count)
        int ret, i;
 
        /* Opening sessions element */
-       ret = mi_lttng_sessions_open(writer);
+       ret = mi_lttng_sessions_open(the_writer);
        if (ret) {
                goto end;
        }
 
        /* Listing sessions */
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_session(writer, &sessions[i], 0);
+               ret = mi_lttng_session(the_writer, &sessions[i], 0);
                if (ret) {
                        goto end;
                }
        }
 
        /* Closing sessions element */
-       ret = mi_lttng_writer_close_element(writer);
+       ret = mi_lttng_writer_close_element(the_writer);
        if (ret) {
                goto end;
        }
@@ -2133,8 +2146,9 @@ static int list_sessions(const char *session_name)
                                        if (*sessions[i].path) {
                                                MSG("%sTrace output: %s\n", indent4, sessions[i].path);
                                        }
-                                       memcpy(&listed_session, &sessions[i],
-                                                       sizeof(listed_session));
+                                       memcpy(&the_listed_session,
+                                                       &sessions[i],
+                                                       sizeof(the_listed_session));
                                        break;
                                }
                        } else {
@@ -2179,20 +2193,20 @@ static int mi_list_domains(struct lttng_domain *domains, int count)
 {
        int i, ret;
        /* Open domains element */
-       ret = mi_lttng_domains_open(writer);
+       ret = mi_lttng_domains_open(the_writer);
        if (ret) {
                goto end;
        }
 
        for (i = 0; i < count; i++) {
-               ret = mi_lttng_domain(writer, &domains[i] , 0);
+               ret = mi_lttng_domain(the_writer, &domains[i], 0);
                if (ret) {
                        goto end;
                }
        }
 
        /* Closing domains element */
-       ret = mi_lttng_writer_close_element(writer);
+       ret = mi_lttng_writer_close_element(the_writer);
        if (ret) {
                goto end;
        }
@@ -2301,23 +2315,24 @@ int cmd_list(int argc, const char **argv)
 
        /* Mi check */
        if (lttng_opt_mi) {
-               writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
-               if (!writer) {
+               the_writer = mi_lttng_writer_create(
+                               fileno(stdout), lttng_opt_mi);
+               if (!the_writer) {
                        ret = CMD_ERROR;
                        goto end;
                }
 
                /* Open command element */
-               ret = mi_lttng_writer_command_open(writer,
-                               mi_lttng_element_command_list);
+               ret = mi_lttng_writer_command_open(
+                               the_writer, mi_lttng_element_command_list);
                if (ret) {
                        ret = CMD_ERROR;
                        goto end;
                }
 
                /* Open output element */
-               ret = mi_lttng_writer_open_element(writer,
-                               mi_lttng_element_command_output);
+               ret = mi_lttng_writer_open_element(
+                               the_writer, mi_lttng_element_command_output);
                if (ret) {
                        ret = CMD_ERROR;
                        goto end;
@@ -2356,8 +2371,8 @@ int cmd_list(int argc, const char **argv)
        }
 
        if (opt_kernel || opt_userspace || opt_jul || opt_log4j || opt_python) {
-               handle = lttng_create_handle(session_name, &domain);
-               if (handle == NULL) {
+               the_handle = lttng_create_handle(session_name, &domain);
+               if (the_handle == NULL) {
                        ret = CMD_FATAL;
                        goto end;
                }
@@ -2405,7 +2420,7 @@ int cmd_list(int argc, const char **argv)
                if (lttng_opt_mi) {
                        /* Open element sessions
                         * Present for xml consistency */
-                       ret = mi_lttng_sessions_open(writer);
+                       ret = mi_lttng_sessions_open(the_writer);
                        if (ret) {
                                goto end;
                        }
@@ -2433,14 +2448,14 @@ int cmd_list(int argc, const char **argv)
                                /* Add of domains and domain element for xml
                                 * consistency and validation
                                 */
-                               ret = mi_lttng_domains_open(writer);
+                               ret = mi_lttng_domains_open(the_writer);
                                if (ret) {
                                        goto end;
                                }
 
                                /* Open domain and leave it open for
                                 * nested channels printing */
-                               ret = mi_lttng_domain(writer, &domain, 1);
+                               ret = mi_lttng_domain(the_writer, &domain, 1);
                                if (ret) {
                                        goto end;
                                }
@@ -2462,7 +2477,8 @@ int cmd_list(int argc, const char **argv)
 
                        if (lttng_opt_mi) {
                                /* Close domain and domain element */
-                               ret = mi_lttng_close_multi_element(writer, 2);
+                               ret = mi_lttng_close_multi_element(
+                                               the_writer, 2);
                        }
                        if (ret) {
                                goto end;
@@ -2481,7 +2497,7 @@ int cmd_list(int argc, const char **argv)
                        }
 
                        if (lttng_opt_mi) {
-                               ret = mi_lttng_domains_open(writer);
+                               ret = mi_lttng_domains_open(the_writer);
                                if (ret) {
                                        ret = CMD_ERROR;
                                        goto end;
@@ -2514,7 +2530,8 @@ int cmd_list(int argc, const char **argv)
                                }
 
                                if (lttng_opt_mi) {
-                                       ret = mi_lttng_domain(writer, &domains[i], 1);
+                                       ret = mi_lttng_domain(the_writer,
+                                                       &domains[i], 1);
                                        if (ret) {
                                                ret = CMD_ERROR;
                                                goto end;
@@ -2522,12 +2539,13 @@ int cmd_list(int argc, const char **argv)
                                }
 
                                /* Clean handle before creating a new one */
-                               if (handle) {
-                                       lttng_destroy_handle(handle);
+                               if (the_handle) {
+                                       lttng_destroy_handle(the_handle);
                                }
 
-                               handle = lttng_create_handle(session_name, &domains[i]);
-                               if (handle == NULL) {
+                               the_handle = lttng_create_handle(
+                                               session_name, &domains[i]);
+                               if (the_handle == NULL) {
                                        ret = CMD_FATAL;
                                        goto end;
                                }
@@ -2563,7 +2581,8 @@ int cmd_list(int argc, const char **argv)
 next_domain:
                                if (lttng_opt_mi) {
                                        /* Close domain element */
-                                       ret = mi_lttng_writer_close_element(writer);
+                                       ret = mi_lttng_writer_close_element(
+                                                       the_writer);
                                        if (ret) {
                                                ret = CMD_ERROR;
                                                goto end;
@@ -2573,7 +2592,8 @@ next_domain:
                        }
                        if (lttng_opt_mi) {
                                /* Close the domains, session and sessions element */
-                               ret = mi_lttng_close_multi_element(writer, 3);
+                               ret = mi_lttng_close_multi_element(
+                                               the_writer, 3);
                                if (ret) {
                                        ret = CMD_ERROR;
                                        goto end;
@@ -2585,14 +2605,14 @@ next_domain:
        /* Mi closing */
        if (lttng_opt_mi) {
                /* Close  output element */
-               ret = mi_lttng_writer_close_element(writer);
+               ret = mi_lttng_writer_close_element(the_writer);
                if (ret) {
                        ret = CMD_ERROR;
                        goto end;
                }
 
                /* Command element close */
-               ret = mi_lttng_writer_command_close(writer);
+               ret = mi_lttng_writer_command_close(the_writer);
                if (ret) {
                        ret = CMD_ERROR;
                        goto end;
@@ -2600,14 +2620,14 @@ next_domain:
        }
 end:
        /* Mi clean-up */
-       if (writer && mi_lttng_writer_destroy(writer)) {
+       if (the_writer && mi_lttng_writer_destroy(the_writer)) {
                /* Preserve original error code */
                ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL;
        }
 
        free(domains);
-       if (handle) {
-               lttng_destroy_handle(handle);
+       if (the_handle) {
+               lttng_destroy_handle(the_handle);
        }
 
        poptFreeContext(pc);