From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x341.google.com (mail-ot1-x341.google.com [IPv6:2607:f8b0:4864:20::341]) by sourceware.org (Postfix) with ESMTPS id 1447A3877023 for ; Tue, 17 Mar 2020 18:01:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1447A3877023 Received: by mail-ot1-x341.google.com with SMTP id r2so7222363otn.6 for ; Tue, 17 Mar 2020 11:01:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=HMY5BKVh2mlrVQwM8hq/IKCa2dhfuI5Zm/n2VQqJw2o=; b=ronmyq6g9II/VyyoD/ZDJLYJmS9NCasJc98fYnBXb93/fFCXRVE6bmS7P/eYvaZqg8 Nyjo5ibkRfexAPtZkzzFyuVvXmG3QG6scynemhVOoGPzP0OCeVV/nTi6qpBol1vu2JDJ m3Kw18gPtHknEpB7Ekjp0pneuTzlIt1BNtJFtY3HOmTm1fd3W3OHxa0eMskfPJt5AiZ1 F96qIffaMTYAGzfTBNQailRh8SzWmStE1OQfO3+61liqyvxlFSyL+TyoZ4lSjR5Y5vDY YcYvserbPYTMQxS7tuItXXkMdGQS6zERyzSP/+EAjcz+aYkH1RJtPnXfre7yHInEJp8l OsIw== X-Gm-Message-State: ANhLgQ2J3Aqi3VFRubLEMLL5RTWJZTdFVPwfeMQhuZYdLxIE0tssrbza feW4Jr4kbOhl5awOw79ZA2cGAPWQbdwbERh3TVjsH2ew X-Google-Smtp-Source: ADFU+vu2Zbqh4CS4DH5i3mthC2tFmVZyuV7LGqVem0n56QJ5azMjmWwbs4D0Bv7ard93Qy6iTSHR0t8KpnI/KINlXUk= X-Received: by 2002:a9d:a51:: with SMTP id 75mr415630otg.112.1584468080934; Tue, 17 Mar 2020 11:01:20 -0700 (PDT) MIME-Version: 1.0 References: <20200317124532.22151-1-n54@gmx.com> In-Reply-To: From: Christian Biesinger Date: Tue, 17 Mar 2020 13:00:44 -0500 Message-ID: Subject: Re: [PATCH] Rename the read symbol to xread To: Kamil Rytarowski Cc: gdb-patches Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-40.7 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL 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: Tue, 17 Mar 2020 18:01:23 -0000 On Tue, Mar 17, 2020 at 12:59 PM Kamil Rytarowski wrote: > > On 17.03.2020 18:51, Christian Biesinger wrote: > > On Tue, Mar 17, 2020 at 7:46 AM Kamil Rytarowski wrote: > >> > >> This avoids clashes with macro read in the NetBSD headers. > > > > Out of curiosity, what does NetBSD define read to? > > > > I think it would be useful to add a comment saying why this is called xread. > > > > NetBSD ships with SSP (stack smashing protector) support that > conditionally redefines read(2). > > https://github.com/NetBSD/src/blob/trunk/include/ssp/unistd.h#L39 Ah thanks. > Is a comment in the commit message enough? Not IMO, that's much harder to find... Christian > > Christian > > > >> --- > >> gdb/user-regs.c | 18 +++++++++--------- > >> 1 file changed, 9 insertions(+), 9 deletions(-) > >> > >> diff --git a/gdb/user-regs.c b/gdb/user-regs.c > >> index a232b1eb000..a968a18bc23 100644 > >> --- a/gdb/user-regs.c > >> +++ b/gdb/user-regs.c > >> @@ -41,7 +41,7 @@ > >> struct user_reg > >> { > >> const char *name; > >> - struct value *(*read) (struct frame_info * frame, const void *baton); > >> + struct value *(*xread) (struct frame_info * frame, const void *baton); > >> const void *baton; > >> struct user_reg *next; > >> }; > >> @@ -60,7 +60,7 @@ struct gdb_user_regs > >> > >> static void > >> append_user_reg (struct gdb_user_regs *regs, const char *name, > >> - user_reg_read_ftype *read, const void *baton, > >> + user_reg_read_ftype *xread, const void *baton, > >> struct user_reg *reg) > >> { > >> /* The caller is responsible for allocating memory needed to store > >> @@ -68,7 +68,7 @@ append_user_reg (struct gdb_user_regs *regs, const char *name, > >> register list stored in the common heap or a specific obstack. */ > >> gdb_assert (reg != NULL); > >> reg->name = name; > >> - reg->read = read; > >> + reg->xread = xread; > >> reg->baton = baton; > >> reg->next = NULL; > >> (*regs->last) = reg; > >> @@ -82,10 +82,10 @@ static struct gdb_user_regs builtin_user_regs = { > >> }; > >> > >> void > >> -user_reg_add_builtin (const char *name, user_reg_read_ftype *read, > >> +user_reg_add_builtin (const char *name, user_reg_read_ftype *xread, > >> const void *baton) > >> { > >> - append_user_reg (&builtin_user_regs, name, read, baton, > >> + append_user_reg (&builtin_user_regs, name, xread, baton, > >> XNEW (struct user_reg)); > >> } > >> > >> @@ -103,14 +103,14 @@ user_regs_init (struct gdbarch *gdbarch) > >> > >> regs->last = ®s->first; > >> for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next) > >> - append_user_reg (regs, reg->name, reg->read, reg->baton, > >> + append_user_reg (regs, reg->name, reg->xread, reg->baton, > >> GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg)); > >> return regs; > >> } > >> > >> void > >> user_reg_add (struct gdbarch *gdbarch, const char *name, > >> - user_reg_read_ftype *read, const void *baton) > >> + user_reg_read_ftype *xread, const void *baton) > >> { > >> struct gdb_user_regs *regs > >> = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); > >> @@ -122,7 +122,7 @@ user_reg_add (struct gdbarch *gdbarch, const char *name, > >> regs = (struct gdb_user_regs *) user_regs_init (gdbarch); > >> deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs); > >> } > >> - append_user_reg (regs, name, read, baton, > >> + append_user_reg (regs, name, xread, baton, > >> GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg)); > >> } > >> > >> @@ -214,7 +214,7 @@ value_of_user_reg (int regnum, struct frame_info *frame) > >> struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs); > >> > >> gdb_assert (reg != NULL); > >> - return reg->read (frame, reg->baton); > >> + return reg->xread (frame, reg->baton); > >> } > >> > >> static void > >> -- > >> 2.25.0 > >> > >