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

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

diff --git a/src/lib/lttng-ctl/clear.c b/src/lib/lttng-ctl/clear.c
index 4219f441d3160627b06af7432f7b2297cc9b42e7..060e2d0f2f986e68922a4c14a7a5f818d49204e5 100644 (file)
--- a/src/lib/lttng-ctl/clear.c
+++ b/src/lib/lttng-ctl/clear.c
@@ -1,19 +1,9 @@
 /*
 /*

- * Copyright (C) 2019 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
- * Copyright (C) 2019 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2019 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2019 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

  *
  *

- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only

  *
  *

- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */
 
 #define _LGPL_SOURCE
  */
 
 #define _LGPL_SOURCE


@@ -64,8 +54,8 @@ void lttng_clear_handle_destroy(struct lttng_clear_handle *handle)
                if (ret) {
                        PERROR("Failed to close lttng-sessiond command socket");
                }
                if (ret) {
                        PERROR("Failed to close lttng-sessiond command socket");
                }

-        }
-        lttng_poll_clean(&handle->communication.events);
+       }
+       lttng_poll_clean(&handle->communication.events);

        lttng_dynamic_buffer_reset(&handle->communication.buffer);
        free(handle);
 }
        lttng_dynamic_buffer_reset(&handle->communication.buffer);
        free(handle);
 }


@@ -88,9 +78,9 @@ struct lttng_clear_handle *lttng_clear_handle_create(int sessiond_socket)
 
        ret = lttng_poll_add(&handle->communication.events, sessiond_socket,
                        LPOLLIN | LPOLLHUP | LPOLLRDHUP | LPOLLERR);
 
        ret = lttng_poll_add(&handle->communication.events, sessiond_socket,
                        LPOLLIN | LPOLLHUP | LPOLLRDHUP | LPOLLERR);

-        if (ret) {
+       if (ret) {

                goto error;
                goto error;

-        }
+       }

 
        handle->communication.bytes_left_to_receive =
                        sizeof(struct lttcomm_lttng_msg);
 
        handle->communication.bytes_left_to_receive =
                        sizeof(struct lttcomm_lttng_msg);


@@ -183,38 +173,37 @@ extern enum lttng_clear_handle_status
        lttng_clear_handle_wait_for_completion(
                struct lttng_clear_handle *handle, int timeout_ms)
 {
        lttng_clear_handle_wait_for_completion(
                struct lttng_clear_handle *handle, int timeout_ms)
 {

-       int ret;

        enum lttng_clear_handle_status status;
        unsigned long time_left_ms = 0;
        const bool has_timeout = timeout_ms > 0;
        struct timespec initial_time;
 
        enum lttng_clear_handle_status status;
        unsigned long time_left_ms = 0;
        const bool has_timeout = timeout_ms > 0;
        struct timespec initial_time;
 

-        if (handle->communication.state == COMMUNICATION_STATE_ERROR) {
+       if (handle->communication.state == COMMUNICATION_STATE_ERROR) {

                status = LTTNG_CLEAR_HANDLE_STATUS_ERROR;
                goto end;
        } else if (handle->communication.state == COMMUNICATION_STATE_END) {
                status = LTTNG_CLEAR_HANDLE_STATUS_COMPLETED;
                goto end;
        }
                status = LTTNG_CLEAR_HANDLE_STATUS_ERROR;
                goto end;
        } else if (handle->communication.state == COMMUNICATION_STATE_END) {
                status = LTTNG_CLEAR_HANDLE_STATUS_COMPLETED;
                goto end;
        }

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

                if (ret) {
                        status = LTTNG_CLEAR_HANDLE_STATUS_ERROR;
                        goto end;
                }
                time_left_ms = (unsigned long) timeout_ms;
                if (ret) {
                        status = LTTNG_CLEAR_HANDLE_STATUS_ERROR;
                        goto end;
                }
                time_left_ms = (unsigned long) timeout_ms;

-        }
+       }

 
 

-        while (handle->communication.state != COMMUNICATION_STATE_END &&
+       while (handle->communication.state != COMMUNICATION_STATE_END &&

                        (time_left_ms || !has_timeout)) {
                int ret;
                uint32_t revents;
                        (time_left_ms || !has_timeout)) {
                int ret;
                uint32_t revents;

-                struct timespec current_time, diff;
+               struct timespec current_time, diff;

                unsigned long diff_ms;
 
                unsigned long diff_ms;
 

-                ret = lttng_poll_wait(&handle->communication.events,
+               ret = lttng_poll_wait(&handle->communication.events,

                                has_timeout ? time_left_ms : -1);
                                has_timeout ? time_left_ms : -1);

-                if (ret == 0) {
+               if (ret == 0) {

                        /* timeout */
                        break;
                } else if (ret < 0) {
                        /* timeout */
                        break;
                } else if (ret < 0) {