From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 47D113937420 for ; Tue, 17 Mar 2020 12:46:14 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1584449172; bh=XjCkc1G1Ic5QSDOF/HY7VvAtPjMPSSKUJ+21aK2Bv38=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=E9kdTo3Ro7bBG3gs4VIW4zWQfDnb1TwlJnpyUJ6aqX4Kfynk7gA3t0vFAFFpFvIyG 70ai/gSqQVAhJ81qeLk7QF9bi6dh66Eg4h84YlTFTMP7S1mpKpQzQD3SAn2YZLrKmb nH3ArgZPL0FLmr2u0Bx8CjW0vhD0e6ZcBlVWJq3c= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([89.79.191.25]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MFbRm-1j4tHW0KOU-00H9zD; Tue, 17 Mar 2020 13:46:12 +0100 From: Kamil Rytarowski To: gdb-patches@sourceware.org Subject: [PATCH] Rename the read symbol to xread Date: Tue, 17 Mar 2020 13:45:32 +0100 Message-Id: <20200317124532.22151-1-n54@gmx.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:cM+h96SVc4SYotswRwin3FVFfdojDj/22MzaHX8JLQymDx7R3Pk WU891w3tR8c57xUotzyd4hlCESpqwblnOMK44cmn+VuIi9X8oX/2bAH/uaAHve6zCzcU8Ph Njg08ZVEkUfG4NnzEA53v24N5rSJD5Rj1s0StfAZk1Cc12lb5yPPK4uILLL0D0EgjvaLnqL vdgiq0wffUrgTox+UhAGA== X-UI-Out-Filterresults: notjunk:1;V03:K0:kRtV0kXDHe4=:tY5gKGUVMkO/4deMPUTgsv E+dSr0r72LXAlm+zgjGQT+1NWWfarulccH9h14MkuS3+r0sf2waiYTk3hUsaA0CRNdyaSGw8c FtRzHQIoEnqh7JtbQX3YvUno8ifmVhhJKg/eNDiEWApoJxyfbMBh51sl/IBf5YJJckr9qwP1w zSLfqScXrR3MC6pET4X3ZAxtXP9FGTTMdY+FOqqsok1qYMS2wGMYW212DqOtnKShocwgrvN0M LVsbVu+WOd95FeM1BM3REUF63sTx0jItXC+Kbz6G7HyATeNkZTDXpg6E3Zq+Whh/HMUcMrhOu pIot8g04RjiZ7/Mn0OoLFiUqcnNVa76CXLia//TwgJplYgqVg6qVt7cKEVEDyo1D7vt88/WzK cbW+ZDnYXhEbXcbewCf8b0XNUZXU8oLVodhtuXDhEkSlRISzZaS8yES4Y1TEwHz/SPc3/uyhr xQTsD4+bhLfflu1U+WPoog9k11h3f9qIN9xo13nIROH4zMkAz+9E1tc9oLl2/jUeLxj0HraPN eGfesyebSo/L3VVFz+jGGlXBhJ/lTT0HH0KHx3mspJh7aDxuiRAuoP93FCTRL7nffqvO4vuuq VEopqj3TjV9ViSrryecYE03L8Mlcivx7cxvHQAuQp2v9dMo1rwGsnvntllCWspQTBOyRLdT5K 5g8IUUdEUynus2WdTZOgHR/kx6P5WDJlQ50itQwbEryt7lcYikEL2U5yuRKo5Eq4aj2JDxXy/ 41mYAlcqHeX94wPux1yUa89ei6X5ukVo+k7KjS7VfKu0F68eKlV8dgKYEYXeJzDmvdpwsOHMO QkrnLAjicrFOSb0fIXj8YC76CJE1RDNQd6O5IBfy227ysm6xV5K2AMWyyDn7+QCLT3OORFFDV m9vKcTpvHL/CouyZYlC0Ft1bx2um5kqvGI3A5ufw7hHLm/WwqMo+qNNCYmGaw0YooV/9aMoh3 MEmSwDW9DqscKpsdW8MivWq+PcKAqlSiu4TBWug5y7ndSuFMn1bIUVxmY/ol6su9iKPKk0VfZ FYr+bvAsB3YuiHoFo8u2mNa1NDdB4Phx/w1AbewPycnhHLYbUihqFGJ8CrIR82OX4zDtU6KTa aPjtKDt6v0VXVLKRU6fRUGrqmjTWzHVp7UDX3hua4JpW2bFuGNjJy7oexgko9T29gm4zQSUDF 1CfXCsiouT5im0xOqeTNMWIoclOVuRQb5/wJ0x9DpLNX2VnuuG7jiBXRaYq2murrzmHns= X-Spam-Status: No, score=-25.4 required=5.0 tests=DKIM_SIGNED, DKIM_VALID, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS 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 12:46:15 -0000 This avoids clashes with macro read in the NetBSD headers. =2D-- 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 =2D-- 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 !=3D NULL); reg->name =3D name; - reg->read =3D read; + reg->xread =3D xread; reg->baton =3D baton; reg->next =3D NULL; (*regs->last) =3D reg; @@ -82,10 +82,10 @@ static struct gdb_user_regs builtin_user_regs =3D { }; 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 =3D ®s->first; for (reg =3D builtin_user_regs.first; reg !=3D NULL; reg =3D 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 =3D (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); @@ -122,7 +122,7 @@ user_reg_add (struct gdbarch *gdbarch, const char *nam= e, regs =3D (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 *fram= e) struct user_reg *reg =3D usernum_to_user_reg (gdbarch, regnum - maxregs= ); gdb_assert (reg !=3D NULL); - return reg->read (frame, reg->baton); + return reg->xread (frame, reg->baton); } static void =2D- 2.25.0