From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by sourceware.org (Postfix) with ESMTPS id E480F3891C30 for ; Sat, 5 Jun 2021 00:14:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E480F3891C30 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f52.google.com with SMTP id y7so6225616wrh.7 for ; Fri, 04 Jun 2021 17:14:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xmxv+znjAAm0Ai9HSSZHJJ4HznBrAmzIwyGCwHPCuLg=; b=OqwZrC9jZuOqygrvIYTYEqgddYFuDk4Isq7tOLYmLM1dy509nbaCQoCwgfMK+BxN3E x1mvtQnqcKVKAQaeVFsW3Tanjbhu2FCWPFLAfRvUN885seS7lqVqVKlpBgrCfoSiZwEe Ix8xNJIoLmBbMi/XZq94kWI9txKNTrCZUbrKTr6k39LTbUsNk4coRl7TXDucNm1MwOfw /f0ZJ6ODwbt8atp9TsWpuk9RuBjKY+esaVf5lol67RHbT0rVw1vjMTaemOBxzX9Xfh8n yyXu4j9CEksBN8uCrZdUrSziUm2fDicAjtNmYjTNsKYZgcuQnbdid7Jv/G7e36NLojiB R0zQ== X-Gm-Message-State: AOAM530tojoFOwOZ1vY56QZzh4eGvZzwC/yPAvF+IEceAmCPWwzpn00e 4BdbxqJ3Or0VVbqmUJQBYiWNdlpmfNe5SQ== X-Google-Smtp-Source: ABdhPJyxENmM5K1hEwleXuQGKCILtppZtLI5RRU7bya4wOJTqOLKOPw3hD9GKcAckckJ+4hnJYn1LA== X-Received: by 2002:a5d:6c61:: with SMTP id r1mr6181921wrz.309.1622852073426; Fri, 04 Jun 2021 17:14:33 -0700 (PDT) Received: from localhost ([2001:8a0:f932:6a00:6b6e:c7b6:c5a7:aac3]) by smtp.gmail.com with ESMTPSA id n8sm6754598wmi.16.2021.06.04.17.14.32 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jun 2021 17:14:32 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 2/2] nat/amd64-linux-siginfo.c: Remove typedefs Date: Sat, 5 Jun 2021 01:14:27 +0100 Message-Id: <20210605001427.3597687-3-pedro@palves.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210605001427.3597687-1-pedro@palves.net> References: <20210605001427.3597687-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2021 00:14:43 -0000 Since GDB is written in C++ now, we don't need struct/union typedefs any more. Remove them from nat/amd64-linux-siginfo.c. gdb/ChangeLog: yyyy-mm-dd Pedro Alves * nat/amd64-linux-siginfo.c (union nat_sigval): Rename to ... (nat_sigval_t): ... this and remove typedef of same name. (struct nat_siginfo): Rename to ... (nat_siginfo_t): ... this and remove typedef of same name. (struct compat_sigval): Rename to ... (compat_sigval_t): ... this and remove typedef of same name. (struct compat_siginfo): Rename to ... (compat_siginfo_t): ... this and remove typedef of same name. (struct compat_x32_siginfo): Rename to ... (compat_x32_siginfo_t): ... this and remove typedef of same name. (amd64_linux_siginfo_fixup_common): Adjust. --- gdb/nat/amd64-linux-siginfo.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gdb/nat/amd64-linux-siginfo.c b/gdb/nat/amd64-linux-siginfo.c index 9ff9361487a..342840e5085 100644 --- a/gdb/nat/amd64-linux-siginfo.c +++ b/gdb/nat/amd64-linux-siginfo.c @@ -45,13 +45,13 @@ typedef int nat_timer_t; /* For native 64-bit, clock_t in _sigchld is 64-bit. */ typedef long nat_clock_t; -typedef union nat_sigval +union nat_sigval_t { nat_int_t sival_int; nat_uptr_t sival_ptr; -} nat_sigval_t; +}; -typedef struct nat_siginfo +struct nat_siginfo_t { int si_signo; int si_errno; @@ -112,7 +112,7 @@ typedef struct nat_siginfo int _fd; } _sigpoll; } _sifields; -} nat_siginfo_t; +}; #endif /* __ILP32__ */ @@ -133,13 +133,13 @@ struct compat_timeval int tv_usec; }; -typedef union compat_sigval +union compat_sigval_t { compat_int_t sival_int; compat_uptr_t sival_ptr; -} compat_sigval_t; +}; -typedef struct compat_siginfo +struct compat_siginfo_t { int si_signo; int si_errno; @@ -201,12 +201,12 @@ typedef struct compat_siginfo int _fd; } _sigpoll; } _sifields; -} compat_siginfo_t; +}; /* For x32, clock_t in _sigchld is 64bit aligned at 4 bytes. */ typedef long __attribute__ ((__aligned__ (4))) compat_x32_clock_t; -typedef struct __attribute__ ((__aligned__ (8))) compat_x32_siginfo +struct __attribute__ ((__aligned__ (8))) compat_x32_siginfo_t { int si_signo; int si_errno; @@ -263,7 +263,7 @@ typedef struct __attribute__ ((__aligned__ (8))) compat_x32_siginfo int _fd; } _sigpoll; } _sifields; -} compat_x32_siginfo_t; +}; /* To simplify usage of siginfo fields. */ @@ -578,20 +578,20 @@ amd64_linux_siginfo_fixup_common (siginfo_t *ptrace, gdb_byte *inf, if (mode == FIXUP_32) { if (direction == 0) - compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, ptrace); + compat_siginfo_from_siginfo ((compat_siginfo_t *) inf, ptrace); else - siginfo_from_compat_siginfo (ptrace, (struct compat_siginfo *) inf); + siginfo_from_compat_siginfo (ptrace, (compat_siginfo_t *) inf); return 1; } else if (mode == FIXUP_X32) { if (direction == 0) - compat_x32_siginfo_from_siginfo ((struct compat_x32_siginfo *) inf, + compat_x32_siginfo_from_siginfo ((compat_x32_siginfo_t *) inf, ptrace); else siginfo_from_compat_x32_siginfo (ptrace, - (struct compat_x32_siginfo *) inf); + (compat_x32_siginfo_t *) inf); return 1; } -- 2.26.2