Fix: sessiond: fix -Wshadow error in save.c

[lttng-tools.git] / src / bin / lttng-sessiond / save.c

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index c3ae627915e3e8994ceb32333ab5a16f56a12212..43b0ed8641f7773694e74562568c9caeb56ba72c 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -1234,7 +1234,6 @@ int save_agent_events(struct config_writer *writer,
 
        rcu_read_lock();
        cds_lfht_for_each_entry(agent->events->ht, &iter.iter, node, node) {
-               int ret;
                struct agent_event *agent_event;
                struct ltt_ust_event fake_event;
 
@@ -1910,21 +1909,7 @@ static int save_process_attr_tracker(struct config_writer *writer,
                goto end;
        }
 
-       if (tracking_policy == LTTNG_TRACKING_POLICY_EXCLUDE_ALL) {
-               /* Tracking nothing; empty list. */
-               ret = config_writer_open_element(writer, element_target_id);
-               if (ret) {
-                       ret = LTTNG_ERR_SAVE_IO_FAIL;
-                       goto end;
-               }
-
-               /* /$element_target_id */
-               ret = config_writer_close_element(writer);
-               if (ret) {
-                       ret = LTTNG_ERR_SAVE_IO_FAIL;
-                       goto end;
-               }
-       } else {
+       if (tracking_policy == LTTNG_TRACKING_POLICY_INCLUDE_SET) {
                unsigned int i, count;
                enum process_attr_tracker_status status =
                                process_attr_tracker_get_inclusion_set(
@@ -2000,7 +1985,7 @@ static int save_process_attr_tracker(struct config_writer *writer,
                }
        }
 
-       /* /targets */
+       /* /values */
        ret = config_writer_close_element(writer);
        if (ret) {
                ret = LTTNG_ERR_SAVE_IO_FAIL;
@@ -2079,6 +2064,7 @@ static int save_process_attr_trackers(struct config_writer *writer,
                break;
        default:
                ret = LTTNG_ERR_INVALID;
+               goto end;
        }
        ret = LTTNG_OK;
 end: