Clean-up: liblttng-ctl: fix two trivial -Wshadow errors

[lttng-tools.git] / src / lib / lttng-ctl / destruction-handle.c

diff --git a/src/lib/lttng-ctl/destruction-handle.c b/src/lib/lttng-ctl/destruction-handle.c
index aeeece7e316abad31884c5498667b1fb09f60f3c..965a823d8085f8a1379399df87d4a733cbe696ba 100644 (file)
--- a/src/lib/lttng-ctl/destruction-handle.c
+++ b/src/lib/lttng-ctl/destruction-handle.c
@@ -227,7 +227,6 @@ enum lttng_destruction_handle_status
 lttng_destruction_handle_wait_for_completion(
                struct lttng_destruction_handle *handle, int timeout_ms)
 {
 lttng_destruction_handle_wait_for_completion(
                struct lttng_destruction_handle *handle, int timeout_ms)
 {

-       int ret;

        enum lttng_destruction_handle_status status;
        unsigned long time_left_ms = 0;
        const bool has_timeout = timeout_ms > 0;
        enum lttng_destruction_handle_status status;
        unsigned long time_left_ms = 0;
        const bool has_timeout = timeout_ms > 0;


@@ -246,7 +245,7 @@ lttng_destruction_handle_wait_for_completion(
                goto end;
        }
        if (has_timeout) {
                goto end;
        }
        if (has_timeout) {

-               ret = lttng_clock_gettime(CLOCK_MONOTONIC, &initial_time);
+               int ret = lttng_clock_gettime(CLOCK_MONOTONIC, &initial_time);

                if (ret) {
                        status = LTTNG_DESTRUCTION_HANDLE_STATUS_ERROR;
                        goto end;
                if (ret) {
                        status = LTTNG_DESTRUCTION_HANDLE_STATUS_ERROR;
                        goto end;